Merge branch 'master' into attachments
Improve attachments in UI