Merging acceleration branch into indigo-devel