Back port of #746 to hydro

Back port of #746