Merge branch 'an/clang-format-typofix'