diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp
index 7ac87d5a001674..a89d9686824770 100644
--- a/src/app/clusters/level-control/level-control.cpp
+++ b/src/app/clusters/level-control/level-control.cpp
@@ -109,7 +109,7 @@ static Status moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8
 static void moveHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, MoveModeEnum moveMode,
                         app::DataModel::Nullable<uint8_t> rate, chip::Optional<BitMask<OptionsBitmap>> optionsMask,
                         chip::Optional<BitMask<OptionsBitmap>> optionsOverride);
-static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, MoveModeEnum stepMode,
+static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, StepModeEnum stepMode,
                         uint8_t stepSize, app::DataModel::Nullable<uint16_t> transitionTimeDs,
                         chip::Optional<BitMask<OptionsBitmap>> optionsMask, chip::Optional<BitMask<OptionsBitmap>> optionsOverride);
 static void stopHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
@@ -1059,7 +1059,7 @@ static void moveHandler(app::CommandHandler * commandObj, const app::ConcreteCom
     commandObj->AddStatus(commandPath, status);
 }
 
-static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, MoveModeEnum stepMode,
+static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, StepModeEnum stepMode,
                         uint8_t stepSize, app::DataModel::Nullable<uint16_t> transitionTimeDs,
                         chip::Optional<BitMask<OptionsBitmap>> optionsMask, chip::Optional<BitMask<OptionsBitmap>> optionsOverride)
 {
@@ -1107,7 +1107,7 @@ static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCom
     // level over the specified transition time.
     switch (stepMode)
     {
-    case MoveModeEnum::kUp:
+    case StepModeEnum::kUp:
         state->increasing = true;
         if (state->maxLevel - currentLevel.Value() < stepSize)
         {
@@ -1119,7 +1119,7 @@ static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCom
             state->moveToLevel = static_cast<uint8_t>(currentLevel.Value() + stepSize);
         }
         break;
-    case MoveModeEnum::kDown:
+    case StepModeEnum::kDown:
         state->increasing = false;
         if (currentLevel.Value() - state->minLevel < stepSize)
         {
diff --git a/third_party/imgui/repo b/third_party/imgui/repo
index 454f36d2af9d92..1ab63d925f21e0 160000
--- a/third_party/imgui/repo
+++ b/third_party/imgui/repo
@@ -1 +1 @@
-Subproject commit 454f36d2af9d92a0f8ffe8536c218247df732edc
+Subproject commit 1ab63d925f21e03be7735661500e5b914dd93c19
diff --git a/third_party/mbedtls/repo b/third_party/mbedtls/repo
index e44be6a7d3d31f..d6d43ec8a59f5f 160000
--- a/third_party/mbedtls/repo
+++ b/third_party/mbedtls/repo
@@ -1 +1 @@
-Subproject commit e44be6a7d3d31f3fac1a74b262b395984d193b05
+Subproject commit d6d43ec8a59f5f5dc1a2138fe57dacea31736e94
diff --git a/third_party/nanopb/repo b/third_party/nanopb/repo
index 9aa922d9dbaf14..9766c4589f61b7 160000
--- a/third_party/nanopb/repo
+++ b/third_party/nanopb/repo
@@ -1 +1 @@
-Subproject commit 9aa922d9dbaf147b07cc0fdb2392a9995c4e95db
+Subproject commit 9766c4589f61b76807a0a394040c15a2d23ef24c
diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo
index 5eccd87a773568..90d97fa3b4292c 160000
--- a/third_party/pigweed/repo
+++ b/third_party/pigweed/repo
@@ -1 +1 @@
-Subproject commit 5eccd87a773568f5db5f5e7f1dd0809860f3d01e
+Subproject commit 90d97fa3b4292c39074e6f2b94dbd1cffa6ee318