Removed grouping
Merge branch 'feature_121'