Backport Pmem from FAUX123