Updated to Hydro build environment
Merged with hydro branch