Merge branch 'fix-attachment-dimensions' into 'develop'