Children grouping feature for template. Codelogic
Merge branch 'release/2.5'