added Group
Merge branch 'feature_group' into develop