Merge "Remove Allocator-based overload"