update deps
Merge branch 'indigo_dev' into indigo_release_candidate