[[ Bug 12831 ]] Ensure non-throwing versions of new/delete are used.
Merge branch 'bugfix-12831' into develop