Merge branch 'release/3.2.0.16-POSTRELEASE'