bring in changes from upstream