Rebase from 'upstream'
importing patches from hydro