Clear out stale maps on session delete.
Merge branch 'stable'