Sync with latest hydro features
Release 1.0.2