Mainly for hydro-devel branch