Merge commit 'refs/top-bases/t/misc/no-nbsp' into t/misc/no-nbsp