Merge branch 'master' into TC-SC-4.3-python-test

Author: raul-marquez-csa

src/app/chip_data_model.gni

@@ -414,6 +414,7 @@ template("chip_data_model") {
       ":${_data_model_name}_zapgen",
       "${chip_root}/src/access",
       "${chip_root}/src/app",
+      "${chip_root}/src/app/cluster-building-blocks",
       "${chip_root}/src/app/common:attribute-type",
       "${chip_root}/src/app/common:cluster-objects",
       "${chip_root}/src/app/common:enums",