Merge branch 'landoltc_fixes' into hydro-devel