Feature #452 Template group updates