Upstream changes r842