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