Merge branch 'oauth2_scopes_migration_hotfix' into 'develop'