Merge pull request #11862 from mukeshcompucorp/fix-template-structure-issues