Merge commit 'refs/top-bases/t/misc/encoding-opt' into t/misc/encoding-opt