Merge branch 'release/3.2.0.17-POSTRELEASE'