Merge commit '2ce47573b4d3664dca4cbc4354c8c600540d16ad' into cluster

This is the last commit before there are more conflicts.

src/uci.cpp

@@ -437,6 +437,8 @@ void UCIEngine::benchmark(std::istream& args) {
     if (threadBinding.empty())
         threadBinding = "none";
 
+    // clang-format off
+
     std::cerr << "==========================="
               << "\nVersion                    : "
               << engine_version_info()
@@ -459,6 +461,8 @@ void UCIEngine::benchmark(std::istream& args) {
               << "\nTotal search time [s]      : " << totalTime / 1000.0
               << "\nNodes/second               : " << 1000 * nodes / totalTime << std::endl;
 
+    // clang-format on
+
     init_search_update_listeners();
 }