latest changes to upstream repo