Merge branch 'mastoapi-omitted' into 'develop'