Merge branch 'fix/add-default-scope-mastoapi' into 'develop'