Fix bug in area deletion fix.
Merge branch 'release_30' into release_31

Fix bug in area deletion fix.
Merge branch 'release_31' into development

Fix bug in area deletion fix.