Revert "Merge branch 'master' into groupManagement"

This reverts commit 3df70fa73e1078b46c35b1981d9061e71129f984, reversing
changes made to d652c34381e11379b1fc2418b6a5dcd63f4b1acd.