Merge commit 'refs/top-bases/t/misc/surrogates' into t/misc/surrogates