backported: Fix error "delete called on pointer returned from a mismatched allocation function"

Fix error "delete called on pointer returned from a mismatched allocation function"

See merge request !542 (merged)

(cherry picked from commit 497d5223)

eb67c9c9 Fix error "delete called on pointer returned from a mismatched allocation function"

mentioned in commit 1582b9e2

merged