WIP Bug-848188

Do not merge, this is for other people to take a look compare performance increase