Various Merge fixes and SurgeryType Fix