Merging acceleration branch into jade-devel