Merge branch 'features/mastoapi/2.7.0-registration' into 'develop'