Sync with indigo-devel