[Indigo] Bring hydro updates to indigo

This rebases the latest developments from ```hydro-devel``` to ```indigo-devel```

Please test!