Fix double deletion with debug area.
Merge branch 'release_31' into development

Fix double deletion with debug area.