Merge templating
handling for all groups
Merge dev-master