Merge remote-tracking branch 'origin/3.2.x'