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