Merge branch 'landoltc_refactoring' into hydro-devel