This commit syncs the groovy_dev branch with the hydro_dev branch