diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 8cf3d6179b..74f59b31d6 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1090,7 +1090,7 @@
 // Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
 // from the two sensors differ too much the print will be aborted.
 //#define TEMP_SENSOR_1_AS_REDUNDANT
-#define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
+#define TEMP_SENSOR_REDUNDANT_MAX_DIFF 10
 
 #define TEMP_RESIDENCY_TIME     2  // (seconds) Time to wait for hotend to "settle" in M109
 #if ENABLED(UnstableTemps)
@@ -1645,7 +1645,7 @@
  *
  * :[2,3,4,5,6,7]
  */
-#if ANY(MachineEnder5Plus, CableExtensionNoiseFilter)
+#if ANY(MachineEnder5Plus, CableExtensionNoiseFilter, MachineCR6, MachineCR6Max)
   #define ENDSTOP_NOISE_THRESHOLD 2
 #endif
 
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index cf28636479..c00cd40898 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -996,7 +996,7 @@
 // If the Nozzle or Bed falls when the Z stepper is disabled, set its resting position here.
 //#define Z_AFTER_DEACTIVATE Z_HOME_POS
 
-#if ANY(MachineEnder5, MachineEnder5Plus)
+#if ANY(MachineEnder5, MachineEnder5Plus, MachineEnder6)
   #define HOME_AFTER_DEACTIVATE  // Require rehoming after steppers are deactivated
 #endif
 
@@ -2475,11 +2475,11 @@
     #define FILAMENT_CHANGE_UNLOAD_FEEDRATE     40  // (mm/s) Unload filament feedrate. This can be pretty fast.
   #endif
   #define FILAMENT_CHANGE_UNLOAD_ACCEL        25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
-  #if ANY(MachineEnder5Plus, MachineCR10SPro, MachineCR10SProV2)
+  #if ANY(MachineEnder5Plus, MachineCR10SPro, MachineCR10SProV2, MachineEnder6)
     #define FILAMENT_CHANGE_UNLOAD_LENGTH      75
   #elif ENABLED(DirectDrive)
     #define FILAMENT_CHANGE_UNLOAD_LENGTH      125
-  #elif ANY(MachineEnder5Plus, MachineCR10Max, MachineCR10S4, MachineCR10S5)
+  #elif ANY(MachineCR10Max, MachineCR10S4, MachineCR10S5)
     #define FILAMENT_CHANGE_UNLOAD_LENGTH   700
   #else
     #define FILAMENT_CHANGE_UNLOAD_LENGTH      430  // (mm) The length of filament for a complete unload.
@@ -2500,7 +2500,7 @@
   #elif ANY(MachineEnder5Plus, MachineCR10Max, MachineCR10S4, MachineCR10S5)
     #define FILAMENT_CHANGE_FAST_LOAD_LENGTH   600
   #else
-    #define FILAMENT_CHANGE_FAST_LOAD_LENGTH   430  // (mm) Load length of filament, from extruder gear to nozzle.
+    #define FILAMENT_CHANGE_FAST_LOAD_LENGTH   230  // (mm) Load length of filament, from extruder gear to nozzle.
   #endif
                                                   //   For Bowden, the full length of the tube and nozzle.
                                                   //   For direct drive, the full length of the nozzle.
diff --git a/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp b/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp
index 9f896c009c..28f4e3527c 100644
--- a/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp
+++ b/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp
@@ -245,6 +245,8 @@ void onIdle()
 
   void yield();
 
+  if(awaitingUserConfirm()) onUserConfirmRequired_P(PSTR("Confirm Continue")); // Handle any extraneous waits
+
   #if HAS_MESH
     if (getLevelingActive())
       rtscheck.RTS_SndData(3, AutoLevelIcon); /*On*/
@@ -2016,7 +2018,9 @@ void onUserConfirmRequired(const char *const msg)
   FilementStatus[0] = 2;
   rtscheck.RTS_SndData(ExchangePageBase + 78, ExchangepageAddr);
 	SERIAL_ECHOLNPGM_P(PSTR("==onUserConfirmRequired=="));
+  onStatusChanged(msg);
 }
+
 void onStatusChanged(const char *const statMsg)
 {
   for (int j = 0; j < 20; j++) // Clear old message
diff --git a/Marlin/src/lcd/extui/dgus_creality/creality_touch/PageHandlers.cpp b/Marlin/src/lcd/extui/dgus_creality/creality_touch/PageHandlers.cpp
index af95866b5a..71eb710d1f 100644
--- a/Marlin/src/lcd/extui/dgus_creality/creality_touch/PageHandlers.cpp
+++ b/Marlin/src/lcd/extui/dgus_creality/creality_touch/PageHandlers.cpp
@@ -141,7 +141,7 @@ void LevelingModeHandler(DGUS_VP_Variable &var, unsigned short buttonValue) {
 void LevelingHandler(DGUS_VP_Variable &var, unsigned short buttonValue) {
     switch (var.VP) {
         case VP_BUTTON_BEDLEVELKEY:
-          const bool busy = TERN0(HOST_KEEPALIVE_FEATURE, ((ExtUI::getMachineState() == GcodeSuite::MarlinBusyState::IN_PROCESS) || (ExtUI::getMachineState() == GcodeSuite::MarlinBusyState::IN_HANDLER)));
+          const bool busy = TERN0(HOST_KEEPALIVE_FEATURE, ((ExtUI::getMachineBusyState() == GcodeSuite::MarlinBusyState::IN_PROCESS) || (ExtUI::getMachineBusyState() == GcodeSuite::MarlinBusyState::IN_HANDLER)));
             if (!busy) {
                 ScreenHandler.PopToOldScreen();
             } else {
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index f1616eeca6..c61841184d 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -223,7 +223,7 @@ namespace ExtUI {
   void setTravelAcceleration_mm_s2(const_float_t );
   void setFeedrate_percent(const_float_t );
   void setFlow_percent(const int16_t, const extruder_t);
-  bool isWaitingOnUser();
+  bool awaitingUserConfirm();
   void setUserConfirmed();
 
   #if ENABLED(LIN_ADVANCE)
@@ -307,7 +307,7 @@ namespace ExtUI {
     float getPIDValues_Ki(const extruder_t);
     float getPIDValues_Kd(const extruder_t);
     void setPIDValues(const_float_t, const_float_t , const_float_t , extruder_t);
-    void startPIDTune(const_float_t, extruder_t);
+    void startPIDTune(celsius_t, extruder_t);
   #endif
 
   #if ENABLED(PIDTEMPBED)
@@ -315,7 +315,7 @@ namespace ExtUI {
     float getBedPIDValues_Ki();
     float getBedPIDValues_Kd();
     void setBedPIDValues(const_float_t, const_float_t , const_float_t );
-    void startBedPIDTune(const_float_t );
+    void startBedPIDTune(celsius_t );
   #endif
 
   /**
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 630bb7cfcb..d184e91390 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -223,10 +223,6 @@ millis_t MarlinUI::next_button_update_ms; // = 0
 
 #endif
 
-#if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
-  bool MarlinUI::lcd_clicked;
-#endif
-
 #if HAS_LCD_MENU
   #include "menu/menu.h"
 
@@ -1294,6 +1290,9 @@ void MarlinUI::update() {
 
 #endif // HAS_WIRED_LCD
 
+#if ANY(HAS_LCD_MENU, EXTENSIBLE_UI)
+  bool MarlinUI::lcd_clicked = false;
+#endif
 #if HAS_STATUS_MESSAGE
 
   ////////////////////////////////////////////
@@ -1454,14 +1453,6 @@ void MarlinUI::update() {
     TERN_(DWIN_CREALITY_LCD, DWIN_StatusChanged(status_message));
   }
 
-  #if ENABLED(EXTENSIBLE_UI)
-    bool MarlinUI::use_click() {
-      const bool click = ExtUI::get_isUICanceled();
-      ExtUI::ui_setUICancelOperation(false);
-      return click;
-    }
-  #endif
-
   #if ENABLED(STATUS_MESSAGE_SCROLLING)
 
     void MarlinUI::advance_status_scroll() {
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index e03e3295d2..7164b3023c 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -526,13 +526,9 @@ public:
 
     static constexpr bool on_status_screen() { return true; }
     FORCE_INLINE static void run_current_screen() { status_screen(); }
-
-  #elif ENABLED(EXTENSIBLE_UI)
-    static bool lcd_clicked;
-    static bool use_click();
   #endif
 
-  #if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
+  #if ANY(HAS_LCD_MENU, EXTENSIBLE_UI)
     static bool lcd_clicked;
     static inline bool use_click() {
       const bool click = lcd_clicked;