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