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