Working on custom tag groups #1081
Merge branch 'develop'