Merge branch 't/blame/extra-columns' into refs/top-bases/next