Fix for non-consistant collections from cache
Merge branch 'release'