Release 3.2.1.2
Merge branch 'release/3.2.1.2' into develop