map eviction improvements
map eviction improvements cont
map eviction improvements review fixes
Merge pull request #1904 from ahmetmircik/mapEvictionImprovement

Map eviction improvement