Merge commit 'refs/top-bases/t/config/escname' into t/config/escname