Sylvain Wallez wrote:
[ ] move template block to 2.1 and keep the old implementation

Nitpicking... 'Move' implies it will be removed from 2.2... So:

 [X] add template block to 2.1 and keep the old jxtg implementation


Vadim