Merge remote-tracking branch 'upstream/2x' into 2.x