Merge "Don't use std::allocator::pointer" into main