More upstream changes merged in