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