hydro-devel branch for scitos_common