Merge "Merge branch 'master' into group-manager" into group-manager