speedup room deletion
Merge branch 'release_30' into release_31

speedup room deletion.