Template Actions bubbling
Merged diff