Merge branch 'linear_check_errors' into hydro-devel