Main clang-format in master ended up sreading over three commits, we have to handle them as a single merge when updating the branches (reduces noise in commits).
