diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 84fbd6f8ed..9a6661e97e 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2799,6 +2799,11 @@
   // Enable this option to collect and display the number
   // of dropped bytes after a file transfer to SD.
   //#define SERIAL_STATS_DROPPED_RX
+
+  // Enable this option to collect and display framing errors.
+  // Framing errors occur when invalid start/stop bits or other
+  // serial protocol violations are detected.
+  //#define SERIAL_STATS_RX_FRAMING_ERRORS
 #endif
 
 // Monitor RX buffer usage
diff --git a/Marlin/src/HAL/HC32/sysclock.cpp b/Marlin/src/HAL/HC32/sysclock.cpp
index e98395c42e..0077bd4db3 100644
--- a/Marlin/src/HAL/HC32/sysclock.cpp
+++ b/Marlin/src/HAL/HC32/sysclock.cpp
@@ -204,7 +204,7 @@ void core_hook_sysclock_init() {
   power_mode_update_post(F_SYSTEM_CLOCK);
 
   // Verify clocks match expected values (at runtime)
-  #if ENABLED(MARLIN_DEV_MODE) || ENABLED(ALWAYS_VALIDATE_CLOCKS)
+  #if ANY(MARLIN_DEV_MODE, ALWAYS_VALIDATE_CLOCKS)
     validate_system_clocks();
   #endif
 
diff --git a/Marlin/src/HAL/TEENSY40_41/inc/SanityCheck.h b/Marlin/src/HAL/TEENSY40_41/inc/SanityCheck.h
index 7b1c466f23..b02fd480b4 100644
--- a/Marlin/src/HAL/TEENSY40_41/inc/SanityCheck.h
+++ b/Marlin/src/HAL/TEENSY40_41/inc/SanityCheck.h
@@ -41,7 +41,7 @@
   #error "POSTMORTEM_DEBUGGING is not yet supported for Teensy 4.0/4.1."
 #endif
 
-#if ENABLED(SERIAL_STATS_MAX_RX_QUEUED) || ENABLED(SERIAL_STATS_DROPPED_RX) || ENABLED(SERIAL_STATS_RX_FRAMING_ERRORS) || ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS)
+#if ANY(SERIAL_STATS_MAX_RX_QUEUED, SERIAL_STATS_DROPPED_RX, SERIAL_STATS_RX_FRAMING_ERRORS, SERIAL_STATS_RX_BUFFER_OVERRUNS)
   #error "SERIAL_STATS_* features not supported on Teensy 4.0/4.1."
 #endif
 
diff --git a/Marlin/src/lcd/dwin/proui/dwin.cpp b/Marlin/src/lcd/dwin/proui/dwin.cpp
index 8684020e17..5d4a102fd2 100644
--- a/Marlin/src/lcd/dwin/proui/dwin.cpp
+++ b/Marlin/src/lcd/dwin/proui/dwin.cpp
@@ -2732,10 +2732,10 @@ void applyMaxAccel() { planner.set_max_acceleration(hmiValue.axis, menuData.valu
     void setHomingX() { hmiValue.axis = X_AXIS; setIntOnClick(min_homing_edit_values.x, max_homing_edit_values.x, motion.homing_feedrate_mm_m.x, applyHomingFR); }
   #endif
   #if HAS_Y_AXIS
-    void setHomingY() { hmiValue.axis = Y_AXIS; setIntOnClick(min_homing_edit_values.y, max_homing_edit_values.y, motion.homing_feedrate_mm_m.x, applyHomingFR); }
+    void setHomingY() { hmiValue.axis = Y_AXIS; setIntOnClick(min_homing_edit_values.y, max_homing_edit_values.y, motion.homing_feedrate_mm_m.y, applyHomingFR); }
   #endif
   #if HAS_Z_AXIS
-    void setHomingZ() { hmiValue.axis = Z_AXIS; setIntOnClick(min_homing_edit_values.z, max_homing_edit_values.z, motion.homing_feedrate_mm_m.x, applyHomingFR); }
+    void setHomingZ() { hmiValue.axis = Z_AXIS; setIntOnClick(min_homing_edit_values.z, max_homing_edit_values.z, motion.homing_feedrate_mm_m.z, applyHomingFR); }
   #endif
 #endif
 
diff --git a/Marlin/src/lcd/dwin/proui/dwinui.h b/Marlin/src/lcd/dwin/proui/dwinui.h
index 0c98fc0d92..1c98704433 100644
--- a/Marlin/src/lcd/dwin/proui/dwinui.h
+++ b/Marlin/src/lcd/dwin/proui/dwinui.h
@@ -117,6 +117,7 @@
 #define ICON_SetPreheat10     ICON_SetCustomPreheat
 #define ICON_ShapingX         ICON_MoveX
 #define ICON_ShapingY         ICON_MoveY
+#define ICON_ShapingZ         ICON_MoveZ
 #define ICON_Sound            ICON_Cool
 #define ICON_TMCSet           ICON_PrintSize
 #define ICON_TMCXSet          ICON_MoveX
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 23665ce243..15f355ccd0 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -745,9 +745,6 @@ public:
 
     #if ENABLED(AUTO_BED_LEVELING_UBL)
       static void ubl_plot(const uint8_t x_plot, const uint8_t y_plot);
-    #endif
-
-    #if ENABLED(AUTO_BED_LEVELING_UBL)
       static void ubl_mesh_edit_start(const float initial);
       static float ubl_mesh_value();
     #endif
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index e8e76e8558..096d9cf3a6 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -347,9 +347,7 @@ public:
   #if HAS_SOFTWARE_ENDSTOPS
     static void apply_limits(xyz_pos_t &target);
     static void update_software_endstops(const AxisEnum axis
-      #if HAS_HOTEND_OFFSET
-        , const uint8_t old_tool_index=0, const uint8_t new_tool_index=0
-      #endif
+      OPTARG(HAS_HOTEND_OFFSET, const uint8_t old_tool_index=0, const uint8_t new_tool_index=0)
     );
     static void set_soft_endstop_loose(const bool loose) { soft_endstop._loose = loose; }
   #else
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 89b35b6b34..00bf83a345 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -4189,7 +4189,7 @@ void Temperature::isr() {
     constexpr bool do_buttons = true;
   #else
     static bool do_buttons;
-    do_buttons ^= true;
+    FLIP(do_buttons);
   #endif
   if (do_buttons) ui.update_buttons();
 
@@ -4688,9 +4688,8 @@ void Temperature::isr() {
           update_time_value = RTS_UPDATE_VALUE;
           if (card.isStillPrinting()) rts.refreshTime();
           rts.start_print_flag = false;
-        #else
-          ui.reset_status();
         #endif
+        ui.reset_status();
         TERN_(PRINTER_EVENT_LEDS, printerEventLEDs.onHeatingDone());
         return true;
       }
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index f90e2074ab..8eb95a9a71 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -82,9 +82,9 @@ exec_test $1 $2 "MEGA2560 RAMPS | AXEL_TPARA" "$3"
 # Extruder Only. No XYZ axes at all.
 #
 restore_configs
-opt_set DEFAULT_AXIS_STEPS_PER_UNIT '{ 4000 }' \
-        DEFAULT_MAX_FEEDRATE '{ 5 }' \
-        DEFAULT_MAX_ACCELERATION '{ 100 }' \
+opt_set DEFAULT_AXIS_STEPS_PER_UNIT '{ 500 }' \
+        DEFAULT_MAX_FEEDRATE '{ 25 }' \
+        DEFAULT_MAX_ACCELERATION '{ 10000 }' \
         MANUAL_FEEDRATE '{ 4*60 }' \
         AXIS_RELATIVE_MODES '{ false }' \
         HOMING_BUMP_MM '{}' HOMING_BUMP_DIVISOR '{}' HOMING_FEEDRATE_MM_M '{}'
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index 2730f9f8f8..7f8151ba8b 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -48,7 +48,7 @@ restore_configs
 opt_set MOTHERBOARD BOARD_RAMBO \
         EXTRUDERS 0 TEMP_SENSOR_0 999 DUMMY_THERMISTOR_999_VALUE 170 Z_HOME_DIR 1 \
         DIGIPOT_MOTOR_CURRENT '{ 120, 120, 120, 120, 120 }' \
-        DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 4000 }' \
+        DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 400 }' \
         DEFAULT_MAX_FEEDRATE '{ 300, 300, 5 }' \
         DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
         MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
@@ -68,7 +68,7 @@ exec_test $1 $2 "Rambo CNC Configuration" "$3"
 #
 restore_configs
 opt_set MOTHERBOARD BOARD_RAMBO EXTRUDERS 0 TEMP_SENSOR_BED 1 TEMP_SENSOR_PROBE 1 TEMP_PROBE_PIN 12 \
-        DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 4000 }' \
+        DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 400 }' \
         DEFAULT_MAX_FEEDRATE '{ 300, 300, 5 }' \
         DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
         MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \