Released version 3.2.0.4
Merge branch 'release/3.2.0.4' into develop