Don't reset the template registry
Merge pull request #17295 from s0undt3ch/hotfix/dont-reset-template-registry

Don't reset the template registry
Merge branch '2014.7' into develop