Merge commit 'refs/top-bases/t/htmlcache/summary' into t/htmlcache/summary