fix #3299 - Find count not working for "1 cache"
Merge pull request #3379 from darekkay/release

fix #3299 - Find count not working for "1 cache"
Merge remote-tracking branch 'origin/release'