diff --git a/components/esp_matter/idf_component.yml b/components/esp_matter/idf_component.yml
deleted file mode 100644
index 5f9b880ff..000000000
--- a/components/esp_matter/idf_component.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-## IDF Component Manager Manifest File
-dependencies:
-    # This matches the dependency of esp_insights
-    # TODO: CON-1374
-    espressif/esp_diag_data_store:
-        version: "1.0.1"
-        require: public
-        rules:
-            - if: "idf_version >=5.0"
-            - if: "target != esp32h2"
diff --git a/components/esp_matter_ota_provider/src/esp_matter_ota_bdx_sender.cpp b/components/esp_matter_ota_provider/src/esp_matter_ota_bdx_sender.cpp
index 97aecebad..e4b99ffcb 100644
--- a/components/esp_matter_ota_provider/src/esp_matter_ota_bdx_sender.cpp
+++ b/components/esp_matter_ota_provider/src/esp_matter_ota_bdx_sender.cpp
@@ -170,7 +170,6 @@ void OtaBdxSender::HandleTransferSessionOutput(TransferSession::OutputEvent &eve
         break;
     case TransferSession::OutputEventType::kAckEOFReceived: {
         ESP_LOGD(TAG, "Transfer completed, got AckEOF");
-        mStopPolling = true; // Stop polling the TransferSession only after receiving BlockAckEOF
         Reset();
         break;
     }
@@ -205,7 +204,7 @@ void OtaBdxSender::Reset()
 {
     mFabricIndex.ClearValue();
     mNodeId.ClearValue();
-    mTransfer.Reset();
+    ResetTransfer();
     if (mExchangeCtx != nullptr) {
         mExchangeCtx->Close();
         mExchangeCtx = nullptr;
diff --git a/examples/zap_light/main/CMakeLists.txt b/examples/zap_light/main/CMakeLists.txt
index fc8456960..c7c4a85fd 100644
--- a/examples/zap_light/main/CMakeLists.txt
+++ b/examples/zap_light/main/CMakeLists.txt
@@ -16,7 +16,6 @@ idf_component_register(SRC_DIRS          "."
                                          "${MATTER_SDK_PATH}/src/app/clusters/level-control"
                                          "${MATTER_SDK_PATH}/src/app/clusters/localization-configuration-server"
                                          "${MATTER_SDK_PATH}/src/app/clusters/network-commissioning"
-                                         "${MATTER_SDK_PATH}/src/app/clusters/occupancy-sensor-server"
                                          "${MATTER_SDK_PATH}/src/app/clusters/on-off-server"
                                          "${MATTER_SDK_PATH}/src/app/clusters/operational-credentials-server"
                                          "${MATTER_SDK_PATH}/src/app/clusters/ota-requestor"