[X] move template block to 2.1 and keep the old implementation
 [ ] move template block to 2.1 and trash the old implementation
 [ ] don't move template block to 2.1

roy huang