Issue 746 hydro backport

Back port of #746