Hydro backport 764

Hydro backport of #764