Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'