Merge "allocator frozen false"