Merge branch 'hotfix' into develop
fixed bug to save attachment metadata
Merge branch 'hotfix'