Merge branch '1478-oauth-admin-scopes-tweaks' into 'develop'