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