Improved new delete
Merge branch 'sapns__new_delete' into master2