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