Merge branch 't/extra-actions/log-consolidate' into refs/top-bases/master