Merge commit 'refs/top-bases/t/extra-actions/log-consolidate' into t/extra-actions...