Apply changes for X32 accepted upstream