Update Antipodes and Trunk 10174
Initial collision pair rework