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