Merge branch 'thermal_test' into hydro-devel