Integrate latest clang-format changes