Fixes #1152 Add Template Group in Global Templates

#1152