Release fix sorting of groups
Merge remote-tracking branch 'origin/develop' into develop