Merge "[codespell] fix typos"