Merging acceleration branch into master