last upstream changes