Merge branch 'oauth-error-messages' into devel