Bug 8723
Preparing release 1.5
Merge branch 'release/1.5' into develop
Back to development: 1.6
Fix when no groups.
Preparing release 1.6
Merge branch 'release/1.6' into develop
Back to development: 1.7