Enable narrower item count caching
Merge branch 'master' into virtual_collections