Attachments fix
Merge branch 'hotfix/hotfix'