bring back changes from hydro release candidate