Merge branches 'trunk-codespell' and 'trunk-cppcheck' into trunk-improvements