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