Add XCFixins from 5.1 ARC branch