Merge branch 'release/3.2.0.18-POSTRELEASE'