upstream changes