Merge branch 'release/3.2.0.2'
Merge branch 'release/3.4.0.1'