Merge branch 'release/3.2'
Merge branch 'master' into develop
BACKLOG-1016 Attachments are now only logged once to reduce the amount of logged data