Merge remote-tracking branch 'upstream/pull/3217'