Merge branch 't/summary/mirroring' into refs/top-bases/t/htmlcache/summary