Revert "Merge branch 'release/3.2.0' into develop"
This reverts commit ab3fd79e9247e462578eb3aad9ab64201b6a7b4f.