Merge branch 'feature/attachments-cleanup' into 'develop'