Hydro devel merge 47

this is #47 target to hydro-devel