Merge branch 'mastoapi-stop-capping-attachments' into 'develop'