Merge hydro into master

Syncing the two repos