Merge branch 'hotfix/hotfix'
Attachments fix
Merge branch 'hotfix/hotfix' into develop