fix for mongroup
Merge branch 'develop'