Merge branch 'oauth2' into 'develop'