Merge hydro and indigo branches using package format 2