Updated mac p4 merge