Merge branch 'security/clear-oauth-with-password' into 'develop'