Indigo devel

This PR is bringing all the latest features from hydro-devel to indigo-devel...