Upstream changes.