- adjustments for cache-statistics
Merge origin/master