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