Merge branch 'lru-map-fix'