Merge pull request #19336 from muxi/v1.21.x

Backport #19309: Fix usage of new and delete