[indigo_dev] Bring in hydro_dev changes to indigo_dev

merging hydro_dev to indigo_dev should be ok to bring in new features and bug fixes.

This can currently not be automatically merged, so please merge manually and resolve merge conflicts.