Group-change, stage 2 (final)
Merge branch 'group-change' into devel