revert
ticket:1 templates forced commit