diff --git a/changelog.md b/changelog.md
index 10fb68a..e3808f0 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,24 @@
 ## grblHAL changelog
 
+<a name="20250802">20250802
+
+Core:
+
+* Fix for transposed options in `$41` - parking cycle enable.
+
+Drivers:
+
+* ESP32: added missing define for I2C for MKS DLC 32 v2.0 board. Ref. discussion comment in [#645](https://github.com/grblHAL/core/discussions/645#discussioncomment-13960933)
+
+* RP2040: added tentative support for Mesa THCAD2 voltage to frequency converter. Not complete!  
+Added option for using Aux out 1 for Neopixels on the RP23U5XBB board. Ref. discussion [#143](https://github.com/grblHAL/RP2040/discussions/143).
+
+Plugins:
+
+* Misc, eventout: fix for potential crash on reset when plugin is enabled.
+
+---
+
 <a name="20250731">Build 20250731
 
 Core:
diff --git a/expanders_init.h b/expanders_init.h
index 446adbb..d692bc2 100644
--- a/expanders_init.h
+++ b/expanders_init.h
@@ -87,6 +87,10 @@ extern void picohal_io_init (void);
 
 // Other expanders
 
+#if THCAD2_ENABLE
+    extern void thcad2_init (void);
+#endif
+
 //
 
 static inline void io_expanders_init (void)
@@ -112,4 +116,8 @@ static inline void io_expanders_init (void)
 #if PICOHAL_IO_ENABLE
     picohal_io_init();
 #endif
+
+#if THCAD2_ENABLE
+    thcad2_init();
+#endif
 }
diff --git a/settings.c b/settings.c
index fca3503..e1c85e1 100644
--- a/settings.c
+++ b/settings.c
@@ -933,6 +933,9 @@ static status_code_t set_parking_enable (setting_id_t id, uint_fast16_t int_valu
 {
     settings.parking.flags.value = bit_istrue(int_value, bit(0)) ? (int_value & 0x07) : 0;
 
+    if(settings.parking.flags.deactivate_upon_init)
+        settings.parking.flags.enable_override_control = On;
+
     return Status_OK;
 }
 
@@ -2059,7 +2062,7 @@ PROGMEM static const setting_detail_t setting_detail[] = {
      { Setting_SpindlePPR, Group_Spindle, "Spindle pulses per revolution (PPR)", NULL, Format_Int16, "###0", NULL, NULL, Setting_IsExtended, &settings.spindle.ppr, NULL, is_setting_available, { .reboot_required = On } },
      { Setting_EnableLegacyRTCommands, Group_General, "Enable legacy RT commands", NULL, Format_Bool, NULL, NULL, NULL, Setting_IsExtendedFn, set_enable_legacy_rt_commands, get_int, NULL },
      { Setting_JogSoftLimited, Group_Jogging, "Limit jog commands", NULL, Format_Bool, NULL, NULL, NULL, Setting_IsExtendedFn, set_jog_soft_limited, get_int, NULL },
-     { Setting_ParkingEnable, Group_SafetyDoor, "Parking cycle", NULL, Format_XBitfield, "Enable,Enable parking override control,Deactivate upon init", NULL, NULL, Setting_IsExtendedFn, set_parking_enable, get_int, NULL },
+     { Setting_ParkingEnable, Group_SafetyDoor, "Parking cycle", NULL, Format_XBitfield, "Enable,Deactivate upon init,Enable parking override control", NULL, NULL, Setting_IsExtendedFn, set_parking_enable, get_int, NULL },
      { Setting_ParkingAxis, Group_SafetyDoor, "Parking axis", NULL, Format_RadioButtons, "X,Y,Z", NULL, NULL, Setting_IsExtended, &settings.parking.axis, NULL, NULL },
      { Setting_HomingLocateCycles, Group_Homing, "Homing passes", NULL, Format_Int8, "##0", "1", "128", Setting_IsExtended, &settings.homing.locate_cycles, NULL, NULL },
      { Setting_HomingCycle_1, Group_Homing, "Axes homing, first pass", NULL, Format_AxisMask, NULL, NULL, NULL, Setting_IsExtendedFn, set_homing_cycle, get_int, NULL },
@@ -2333,8 +2336,8 @@ PROGMEM static const setting_descr_t setting_descr[] = {
      { Settings_RotaryAxes, "Designates axes as rotary, interpretation some other relevant axis settings is changed accordingly." },
 #endif
 #ifndef NO_SAFETY_DOOR_SUPPORT
-    { Setting_DoorSpindleOnDelay, "Delay to allow spindle to spin up after safety door is opened." },
-    { Setting_DoorCoolantOnDelay, "Delay to allow coolant to restart after safety door is opened." },
+    { Setting_DoorSpindleOnDelay, "Delay to allow spindle to spin up after safety door is closed or on resume from park." },
+    { Setting_DoorCoolantOnDelay, "Delay to allow coolant to restart after safety door is closed or on resume from park." },
 #endif
     { Setting_SpindleOnDelay, "Delay to allow spindle to spin up. 0 or 0.5 - 20s\\n"
                               "If spindle supports \"at speed\" functionality it is the time to wait before alarm 14 is raised."