merge with indigo-devel