Merge branch 'fix/oauth-http-basic' into 'develop'