Merge remote-tracking branch 'origin/3.2.1-post' into 3.2.x