Upstream changes merged in