bring back changes from Hydro release candidate