Update sub20 branch

Applied recent changes on hydro-devel branch.