Merge remote-tracking branch 'origin/landoltc_3d' into hydro-devel