Hydro backport of #740

Hydro backport of #740