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