Merge branch 'master' into feature/message-cluster-present-message-update

Author: lazarkov

src/app/chip_data_model.gni

@@ -356,6 +356,12 @@ template("chip_data_model") {
           "${_app_root}/clusters/${cluster}/${cluster}.h",
           "${_app_root}/clusters/${cluster}/EnergyReportingTestEventTriggerHandler.h",
         ]
+      } else if (cluster == "thread-network-diagnostics-server") {
+        sources += [
+          "${_app_root}/clusters/${cluster}/${cluster}.cpp",
+          "${_app_root}/clusters/${cluster}/thread-network-diagnostics-provider.cpp",
+          "${_app_root}/clusters/${cluster}/thread-network-diagnostics-provider.h",
+        ]
       } else {
         sources += [ "${_app_root}/clusters/${cluster}/${cluster}.cpp" ]
       }