Merge remote-tracking branch 'upstream/master' into mirror-merge-10235436