Hydro backport 770

Hydro backport of #770