Merge branch 'release/3.2'
Added patch for BACKLOG-845 and some other small changes
Merge branch 'master' into develop