Merge branch 'fix/mastoapi-attachment-count' into 'develop'