Merge branch '963_oob_oauth_redirect_fix' into 'develop'