Merge branch 'mastoapi-update-credentials' into 'develop'