[indigo_dev] harmonize hydro_dev and indigo_dev