Merge branch 'ks/typofix-commit-c-comment' into maint