BS12 -> Ponies merge