Merge commit 'refs/top-bases/t/misc/base-absolute' into t/misc/base-absolute