Vaibhav kaushal feature multi templates

Copy of pull #298 because that one was set for merge into master. This request will merge to feature-multiTemplates.