Merge "AuthenticationCallback should not be cleared onAuthenticationFailed" into oc-dev