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