merged hydro changes in master, then added indigo changes on top so that master is like indigo