Merge "Adding compat calls for building with UB"