Merge PM allocator updates