Template rewrite for {xx} tags
Merge branch '4.3-Template' into 4.3-appsfuel