Merge "Merge branch 'group-manager'"