Merge "Fix clang-format-11 brace wrapping rule" into devel/master