Merge branch 'debugging' into hydro-devel [ci skip]