Merge branch 'data_fusion/debugging' into hydro-devel