Merge branch 'oauth2_strengthening' into 'develop'