Finishes the work with attachments
Merge branches 'master' and 'dev'