Upstream changes merged