more upstream changes