Merge remote-tracking branch 'upstream/pull/2917' into master