Merge Berachpack changes into Ponypack