upstream latest changes