diff --git a/.github/workflows/compile-configs.yml b/.github/workflows/compile-configs.yml
index fcff6f0af0..f7dc87c53b 100644
--- a/.github/workflows/compile-configs.yml
+++ b/.github/workflows/compile-configs.yml
@@ -14,15 +14,15 @@ jobs:
     strategy:
       matrix:
         chip: [GD32,N32]
-        temp: [true,false]
         inshape: [true,false]
+        temp: [true,false]
         tjc: [true,false]
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -46,8 +46,8 @@ jobs:
       id: build_configs
       run: |
         if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi;
-        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($IS); then ISTMP=-IS; else ISTMP=; fi;
+        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($TJC); then DTMP=TJC-; else DTMP=; fi;
         echo "filename=${DTMP}Aquila_${AVTMP}_Default${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
         > Marlin/Configuration.h
@@ -72,8 +72,8 @@ jobs:
         mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin
       env:
         AQUILA_VER: ${{ matrix.chip }}
-        TP: ${{ matrix.temp }}
         IS: ${{ matrix.inshape }}
+        TP: ${{ matrix.temp }}
         TJC: ${{ matrix.tjc }}
     - name: Get release
       id: get_release
@@ -95,15 +95,15 @@ jobs:
     strategy:
       matrix:
         chip: [GD32,N32]
-        temp: [true,false]
         inshape: [true,false]
+        temp: [true,false]
         tjc: [true,false]
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -127,8 +127,8 @@ jobs:
       id: build_configs
       run: |
         if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi;
-        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($IS); then ISTMP=-IS; else ISTMP=; fi;
+        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($TJC); then DTMP=TJC-; else DTMP=; fi;
         echo "filename=${DTMP}Aquila_${AVTMP}_MM-ProUI-EX${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
         > Marlin/Configuration.h
@@ -153,8 +153,8 @@ jobs:
         mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin
       env:
         AQUILA_VER: ${{ matrix.chip }}
-        TP: ${{ matrix.temp }}
         IS: ${{ matrix.inshape }}
+        TP: ${{ matrix.temp }}
         TJC: ${{ matrix.tjc }}
     - name: Get release
       id: get_release
@@ -176,6 +176,7 @@ jobs:
     strategy:
       matrix:
         chip: [GD32,N32]
+        plr: [true,false]
         temp: [true,false]
         tjc: [true,false]
         t13: [true,false]
@@ -183,9 +184,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -209,11 +210,12 @@ jobs:
       id: build_configs
       run: |
         if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi;
+        if ($PLR); then PLTMP=-PLR; else PLTMP=; fi;
         if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($TJC); then DTMP=TJC-; else DTMP=; fi;
         if ($T13); then TTMP=_SPRT13; else TTMP=; fi;
         if ($BMP); then MPTMP=_BMP; else MPTMP=; fi;
-        echo "filename=${DTMP}Aquila_${AVTMP}${TTMP}${MPTMP}_UBL-ProUI-EX${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
+        echo "filename=${DTMP}Aquila_${AVTMP}${TTMP}${MPTMP}_UBL-ProUI-EX${PLTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
         > Marlin/Configuration.h
         > Marlin/Configuration_adv.h
         > Marlin/Version.h
@@ -221,13 +223,17 @@ jobs:
         cp configurations/Voxelab\ Aquila/UBL/Configuration_adv.h Marlin/Configuration_adv.h
         cp configurations/Voxelab\ Aquila/UBL/Version.h Marlin/Version.h
         sed -i "s/default_envs =.*/default_envs = ${AQUILA_VER}F103RC_voxelab_maple/" platformio.ini
+        if ($PLR); then PLMP='\/\/'; PRMP=; else PLMP=; PRMP='\/\/'; fi;
+        sed -i "s/.*#define PROUI_ITEM_PLR/${PRMP}#define PROUI_ITEM_PLR/" Marlin/Configuration.h
+        sed -i "s/.*#define POWER_LOSS_RECOVERY/${PRMP}#define POWER_LOSS_RECOVERY/" Marlin/Configuration_adv.h
+        sed -i "s/.*#define MARLIN_SMALL_BUILD/${PRMP}#define MARLIN_SMALL_BUILD/" Marlin/Configuration_adv.h
         if ($TP); then PTEMP='\/\/'; MTEMP=; else PTEMP=; MTEMP='\/\/'; fi;
         sed -i "0,/^#define PIDTEMP/ s/.*#define PIDTEMP/${PTEMP}#define PIDTEMP/" Marlin/Configuration.h
         sed -i "s/.*#define MPCTEMP/${MTEMP}#define MPCTEMP/" Marlin/Configuration.h
         sed -i "s/.*#define PREHEAT_2_LABEL/${PTEMP}#define PREHEAT_2_LABEL/" Marlin/Configuration.h
         sed -i "s/.*#define USE_GRID_MESHVIEWER 1/${PTEMP}#define USE_GRID_MESHVIEWER 1/" Marlin/Configuration.h
-        sed -i "s/.*#define HAS_CUSTOM_COLORS 1/${PTEMP}#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
         sed -i "s/.*#define CAPABILITIES_REPORT/${PTEMP}#define CAPABILITIES_REPORT/" Marlin/Configuration_adv.h
+        sed -i "s/.*#define HAS_CUSTOM_COLORS 1/${PLMP}${PTEMP}#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
         if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi;
         sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h
         sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h
@@ -246,6 +252,7 @@ jobs:
         mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin
       env:
         AQUILA_VER: ${{ matrix.chip }}
+        PLR: ${{ matrix.plr }}
         TP: ${{ matrix.temp }}
         TJC: ${{ matrix.tjc }}
         T13: ${{ matrix.t13 }}
@@ -264,21 +271,22 @@ jobs:
         asset_path: temp/build.bin
         asset_name: ${{ steps.build_configs.outputs.filename }}
         asset_content_type: application/x-binary
-  Build-UBL-EX-PLR-A:            # UBL EX PLR for Aquila
-    name: Build UBL EX PLR Files A
+  Build-UBL-EX-IS-A:            # UBL EX IS for Aquila
+    name: Build UBL EX IS Files A
     runs-on: ubuntu-latest
     strategy:
       matrix:
         chip: [GD32,N32]
+        plr: [true,false]
         tjc: [true,false]
         t13: [true,false]
         bmp: [true,false]
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -302,10 +310,11 @@ jobs:
       id: build_configs
       run: |
         if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi;
+        if ($PLR); then PLTMP=-PLR; else PLTMP=; fi;
         if ($TJC); then DTMP=TJC-; else DTMP=; fi;
         if ($T13); then TTMP=_SPRT13; else TTMP=; fi;
         if ($BMP); then MPTMP=_BMP; else MPTMP=; fi;
-        echo "filename=${DTMP}Aquila_${AVTMP}${TTMP}${MPTMP}_UBL-ProUI-EX-PLR$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
+        echo "filename=${DTMP}Aquila_${AVTMP}${TTMP}${MPTMP}_UBL-ProUI-EX${PLTMP}-IS$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
         > Marlin/Configuration.h
         > Marlin/Configuration_adv.h
         > Marlin/Version.h
@@ -313,16 +322,21 @@ jobs:
         cp configurations/Voxelab\ Aquila/UBL/Configuration_adv.h Marlin/Configuration_adv.h
         cp configurations/Voxelab\ Aquila/UBL/Version.h Marlin/Version.h
         sed -i "s/default_envs =.*/default_envs = ${AQUILA_VER}F103RC_voxelab_maple/" platformio.ini
+        sed -i "s/.*#define MARLIN_SMALL_BUILD/#define MARLIN_SMALL_BUILD/" Marlin/Configuration_adv.h
         sed -i "s/.*#define HAS_CUSTOM_COLORS 1/\/\/#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
-        sed -i "s/.*#define PROUI_ITEM_PLR/#define PROUI_ITEM_PLR/" Marlin/Configuration.h
-        sed -i "s/.*#define POWER_LOSS_RECOVERY/#define POWER_LOSS_RECOVERY/" Marlin/Configuration_adv.h
         sed -i "s/.*#define NO_HOME_OFFSETS/#define NO_HOME_OFFSETS/" Marlin/Configuration_adv.h
-        if ($T13); then THMP="13"; DSMP="424.9"; else THMP="1"; DSMP="98"; fi;
-        sed -i "s/^#define TEMP_SENSOR_0.*/#define TEMP_SENSOR_0 ${THMP}/" Marlin/Configuration.h
-        sed -i "s/.*#define DEFAULT_AXIS_STEPS_PER_UNIT.*/#define DEFAULT_AXIS_STEPS_PER_UNIT { 80,80,400,${DSMP} }/" Marlin/Configuration.h
+        sed -i "s/.*#define INPUT_SHAPING_X/#define INPUT_SHAPING_X/" Marlin/Configuration_adv.h
+        sed -i "s/.*#define INPUT_SHAPING_Y/#define INPUT_SHAPING_Y/" Marlin/Configuration_adv.h
+        sed -i "s/.*#define INPUT_SHAPING_Z/#define INPUT_SHAPING_Z/" Marlin/Configuration_adv.h
+        if ($PLR); then PRMP=; else PRMP='\/\/'; fi;
+        sed -i "s/.*#define PROUI_ITEM_PLR/${PRMP}#define PROUI_ITEM_PLR/" Marlin/Configuration.h
+        sed -i "s/.*#define POWER_LOSS_RECOVERY/${PRMP}#define POWER_LOSS_RECOVERY/" Marlin/Configuration_adv.h
         if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi;
         sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h
         sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h
+        if ($T13); then THMP="13"; DSMP="424.9"; else THMP="1"; DSMP="98"; fi;
+        sed -i "s/^#define TEMP_SENSOR_0.*/#define TEMP_SENSOR_0 ${THMP}/" Marlin/Configuration.h
+        sed -i "s/.*#define DEFAULT_AXIS_STEPS_PER_UNIT.*/#define DEFAULT_AXIS_STEPS_PER_UNIT { 80,80,400,${DSMP} }/" Marlin/Configuration.h
         if ($BMP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi;
         sed -i "s/.*#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/${MPDEMP}#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/" Marlin/Configuration.h
         sed -i "s/.*#define Z_MIN_ENDSTOP_HIT_STATE.*/#define Z_MIN_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h
@@ -335,6 +349,7 @@ jobs:
         mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin
       env:
         AQUILA_VER: ${{ matrix.chip }}
+        PLR: ${{ matrix.plr }}
         TJC: ${{ matrix.tjc }}
         T13: ${{ matrix.t13 }}
         BMP: ${{ matrix.bmp }}
@@ -358,14 +373,15 @@ jobs:
     strategy:
       matrix:
         chip: [GD32,N32]
+        plr: [true,false]
         tjc: [true,false]
-        pwr: [true,false]
+        t13: [true,false]
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -389,9 +405,10 @@ jobs:
       id: build_configs
       run: |
         if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi;
+        if ($PLR); then PLTMP=-PLR; else PLTMP=; fi;
         if ($TJC); then DTMP=TJC-; else DTMP=; fi;
-        if ($PWR); then PLTMP=-PLR; else PLTMP=; fi;
-        echo "filename=${DTMP}Aquila_${AVTMP}_IND_UBL-ProUI-EX${PLTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
+        if ($T13); then TTMP=_SPRT13; else TTMP=; fi;
+        echo "filename=${DTMP}Aquila_${AVTMP}_IND${TTMP}_UBL-ProUI-EX${PLTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
         > Marlin/Configuration.h
         > Marlin/Configuration_adv.h
         > Marlin/Version.h
@@ -399,20 +416,25 @@ jobs:
         cp configurations/Voxelab\ Aquila/X3/Configuration_adv.h Marlin/Configuration_adv.h
         cp configurations/Voxelab\ Aquila/X3/Version.h Marlin/Version.h
         sed -i "s/default_envs =.*/default_envs = ${AQUILA_VER}F103RC_voxelab_maple/" platformio.ini
-        if ($PWR); then PLMP='\/\/'; PRMP=; else PLMP=; PRMP='\/\/'; fi;
+        if ($PLR); then PLMP='\/\/'; PRMP=; else PLMP=; PRMP='\/\/'; fi;
         sed -i "s/.*#define HAS_CUSTOM_COLORS 1/${PLMP}#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
+        sed -i "s/.*#define PROUI_ITEM_PLR/${PRMP}#define PROUI_ITEM_PLR/" Marlin/Configuration.h
         sed -i "s/.*#define POWER_LOSS_RECOVERY/${PRMP}#define POWER_LOSS_RECOVERY/" Marlin/Configuration_adv.h
         sed -i "s/.*#define CAPABILITIES_REPORT/${PLMP}#define CAPABILITIES_REPORT/" Marlin/Configuration_adv.h
         if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi;
         sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h
         sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h
+        if ($T13); then THMP="13"; DSMP="424.9"; else THMP="1"; DSMP="98"; fi;
+        sed -i "s/^#define TEMP_SENSOR_0.*/#define TEMP_SENSOR_0 ${THMP}/" Marlin/Configuration.h
+        sed -i "s/.*#define DEFAULT_AXIS_STEPS_PER_UNIT.*/#define DEFAULT_AXIS_STEPS_PER_UNIT { 80,80,400,${DSMP} }/" Marlin/Configuration.h
         pio run
         mkdir temp
         mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin
       env:
         AQUILA_VER: ${{ matrix.chip }}
+        PLR: ${{ matrix.plr }}
         TJC: ${{ matrix.tjc }}
-        PWR: ${{ matrix.pwr }}
+        T13: ${{ matrix.t13 }}
     - name: Get release
       id: get_release
       uses: bruceadams/get-release@v1.3.2
@@ -433,15 +455,17 @@ jobs:
     strategy:
       matrix:
         chip: [GD32,N32]
+        plr: [true,false]
         temp: [true,false]
         tjc: [true,false]
+        t13:  [true,false]
         bmp: [true,false]
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -465,10 +489,12 @@ jobs:
       id: build_configs
       run: |
         if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi;
+        if ($PLR); then PLTMP=-PLR; else PLTMP=; fi;
         if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($TJC); then DTMP=TJC-; else DTMP=; fi;
+        if ($T13); then TTMP=_SPRT13; else TTMP=; fi;
         if ($BMP); then MPTMP=_BMP; else MPTMP=; fi;
-        echo "filename=${DTMP}Aquila_${AVTMP}${MPTMP}_BLT-ProUI-EX${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
+        echo "filename=${DTMP}Aquila_${AVTMP}${TTMP}${MPTMP}_BLT-ProUI-EX${PLTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
         > Marlin/Configuration.h
         > Marlin/Configuration_adv.h
         > Marlin/Version.h
@@ -477,6 +503,10 @@ jobs:
         cp configurations/Voxelab\ Aquila/BLT/Version.h Marlin/Version.h
         sed -i "s/default_envs =.*/default_envs = ${AQUILA_VER}F103RC_voxelab_maple/" platformio.ini
         sed -i "s/.*#define PROUI_EX 1/#define PROUI_EX 1/" Marlin/Configuration.h
+        if ($PLR); then PRMP=; else PRMP='\/\/'; fi;
+        sed -i "s/.*#define PROUI_ITEM_PLR/${PRMP}#define PROUI_ITEM_PLR/" Marlin/Configuration.h
+        sed -i "s/.*#define POWER_LOSS_RECOVERY/${PRMP}#define POWER_LOSS_RECOVERY/" Marlin/Configuration_adv.h
+        sed -i "s/.*#define MARLIN_SMALL_BUILD/${PRMP}#define MARLIN_SMALL_BUILD/" Marlin/Configuration_adv.h
         if ($TP); then PTEMP='\/\/'; MTEMP=; else PTEMP=; MTEMP='\/\/'; fi;
         sed -i "0,/^#define PIDTEMP/ s/.*#define PIDTEMP/${PTEMP}#define PIDTEMP/" Marlin/Configuration.h
         sed -i "s/.*#define MPCTEMP/${MTEMP}#define MPCTEMP/" Marlin/Configuration.h
@@ -484,6 +514,9 @@ jobs:
         if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi;
         sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h
         sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h
+        if ($T13); then THMP="13"; DSMP="424.9"; else THMP="1"; DSMP="98"; fi;
+        sed -i "s/^#define TEMP_SENSOR_0.*/#define TEMP_SENSOR_0 ${THMP}/" Marlin/Configuration.h
+        sed -i "s/.*#define DEFAULT_AXIS_STEPS_PER_UNIT.*/#define DEFAULT_AXIS_STEPS_PER_UNIT { 80,80,400,${DSMP} }/" Marlin/Configuration.h
         if ($BMP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi;
         sed -i "s/.*#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/${MPDEMP}#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/" Marlin/Configuration.h
         sed -i "s/.*#define Z_MIN_ENDSTOP_HIT_STATE.*/#define Z_MIN_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h
@@ -496,8 +529,10 @@ jobs:
         mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin
       env:
         AQUILA_VER: ${{ matrix.chip }}
+        PLR: ${{ matrix.plr }}
         TP: ${{ matrix.temp }}
         TJC: ${{ matrix.tjc }}
+        T13: ${{ matrix.t13 }}
         BMP: ${{ matrix.bmp }}
     - name: Get release
       id: get_release
@@ -519,6 +554,7 @@ jobs:
     strategy:
       matrix:
         chip: [GD32,N32]
+        plr: [true,false]
         temp: [true,false]
         inshape: [true,false]
         tjc: [true,false]
@@ -526,9 +562,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -552,11 +588,12 @@ jobs:
       id: build_configs
       run: |
         if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi;
-        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
+        if ($PLR); then PLTMP=-PLR; else PLTMP=; fi;
         if ($IS); then ISTMP=-IS; else ISTMP=; fi;
+        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($TJC); then DTMP=TJC-; else DTMP=; fi;
         if ($BMP); then MPTMP=_BMP; else MPTMP=; fi;
-        echo "filename=${DTMP}Aquila_${AVTMP}${MPTMP}_BLT${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
+        echo "filename=${DTMP}Aquila_${AVTMP}${MPTMP}_BLT${PLTMP}${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
         > Marlin/Configuration.h
         > Marlin/Configuration_adv.h
         > Marlin/Version.h
@@ -564,6 +601,10 @@ jobs:
         cp configurations/Voxelab\ Aquila/BLT/Configuration_adv.h Marlin/Configuration_adv.h
         cp configurations/Voxelab\ Aquila/BLT/Version.h Marlin/Version.h
         sed -i "s/default_envs =.*/default_envs = ${AQUILA_VER}F103RC_voxelab_maple/" platformio.ini
+        if ($PLR); then PLMP='\/\/'; PRMP=; else PLMP=; PRMP='\/\/'; fi;
+        sed -i "s/.*#define PROUI_ITEM_PLR/${PRMP}#define PROUI_ITEM_PLR/" Marlin/Configuration.h
+        sed -i "s/.*#define POWER_LOSS_RECOVERY/${PRMP}#define POWER_LOSS_RECOVERY/" Marlin/Configuration_adv.h
+        sed -i "s/.*#define MARLIN_SMALL_BUILD/${PRMP}#define MARLIN_SMALL_BUILD/" Marlin/Configuration_adv.h
         if ($IS); then STEMP=; else STEMP='\/\/'; fi;
         sed -i "s/.*#define INPUT_SHAPING_X/${STEMP}#define INPUT_SHAPING_X/" Marlin/Configuration_adv.h
         sed -i "s/.*#define INPUT_SHAPING_Y/${STEMP}#define INPUT_SHAPING_Y/" Marlin/Configuration_adv.h
@@ -586,8 +627,9 @@ jobs:
         mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin
       env:
         AQUILA_VER: ${{ matrix.chip }}
-        TP: ${{ matrix.temp }}
+        PLR: ${{ matrix.plr }}
         IS: ${{ matrix.inshape }}
+        TP: ${{ matrix.temp }}
         TJC: ${{ matrix.tjc }}
         BMP: ${{ matrix.bmp }}
     - name: Get release
@@ -615,9 +657,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -703,9 +745,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -777,15 +819,15 @@ jobs:
     strategy:
       matrix:
         chip: [427,422]
-        temp: [true,false]
         inshape: [true,false]
+        temp: [true,false]
         tjc: [true,false]
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -809,8 +851,8 @@ jobs:
       id: build_configs
       run: |
         if [ "$AQUILA_VER" = 427 ]; then AVTMP="427"; DBORD='CREALITY_V427'; else AVTMP="422"; DBORD='CREALITY_V422'; fi;
-        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($IS); then ISTMP=-IS; else ISTMP=; fi;
+        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($TJC); then DTMP=TJC-; else DTMP=; fi;
         echo "filename=${DTMP}Aquila_${AVTMP}_Default${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
         > Marlin/Configuration.h
@@ -836,8 +878,8 @@ jobs:
         mv .pio/build/STM32F103RE_creality/*.bin temp/build.bin
       env:
         AQUILA_VER: ${{ matrix.chip }}
-        TP: ${{ matrix.temp }}
         IS: ${{ matrix.inshape }}
+        TP: ${{ matrix.temp }}
         TJC: ${{ matrix.tjc }}
     - name: Get release
       id: get_release
@@ -859,15 +901,15 @@ jobs:
     strategy:
       matrix:
         chip: [427,422]
-        temp: [true,false]
         inshape: [true,false]
+        temp: [true,false]
         tjc: [true,false]
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -891,8 +933,8 @@ jobs:
       id: build_configs
       run: |
         if [ "$AQUILA_VER" = 427 ]; then AVTMP="427"; DBORD='CREALITY_V427'; else AVTMP="422"; DBORD='CREALITY_V422'; fi;
-        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($IS); then ISTMP=-IS; else ISTMP=; fi;
+        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($TJC); then DTMP=TJC-; else DTMP=; fi;
         echo "filename=${DTMP}Aquila_${AVTMP}_MM-ProUI-EX${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
         > Marlin/Configuration.h
@@ -918,8 +960,8 @@ jobs:
         mv .pio/build/STM32F103RE_creality/*.bin temp/build.bin
       env:
         AQUILA_VER: ${{ matrix.chip }}
-        TP: ${{ matrix.temp }}
         IS: ${{ matrix.inshape }}
+        TP: ${{ matrix.temp }}
         TJC: ${{ matrix.tjc }}
     - name: Get release
       id: get_release
@@ -941,17 +983,17 @@ jobs:
     strategy:
       matrix:
         chip: [427,422]
-        temp: [true,false]
         inshape: [true,false]
+        temp: [true,false]
         tjc: [true,false]
         t13: [true,false]
         bmp: [true,false]
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -975,8 +1017,8 @@ jobs:
       id: build_configs
       run: |
         if [ "$AQUILA_VER" = 427 ]; then AVTMP="427"; DBORD='CREALITY_V427'; else AVTMP="422"; DBORD='CREALITY_V422'; fi;
-        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($IS); then ISTMP=-IS; else ISTMP=; fi;
+        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($TJC); then DTMP=TJC-; else DTMP=; fi;
         if ($T13); then TTMP=_SPRT13; else TTMP=; fi;
         if ($BMP); then MPTMP=_BMP; else MPTMP=; fi;
@@ -1014,8 +1056,8 @@ jobs:
         mv .pio/build/STM32F103RE_creality/*.bin temp/build.bin
       env:
         AQUILA_VER: ${{ matrix.chip }}
-        TP: ${{ matrix.temp }}
         IS: ${{ matrix.inshape }}
+        TP: ${{ matrix.temp }}
         TJC: ${{ matrix.tjc }}
         T13: ${{ matrix.t13 }}
         BMP: ${{ matrix.bmp }}
@@ -1039,16 +1081,16 @@ jobs:
     strategy:
       matrix:
         chip: [427,422]
-        temp: [true,false]
         inshape: [true,false]
+        temp: [true,false]
         tjc: [true,false]
         bmp: [true,false]
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -1072,8 +1114,8 @@ jobs:
       id: build_configs
       run: |
         if [ "$AQUILA_VER" = 427 ]; then AVTMP="427"; DBORD='CREALITY_V427'; else AVTMP="422"; DBORD='CREALITY_V422'; fi;
-        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($IS); then ISTMP=-IS; else ISTMP=; fi;
+        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($TJC); then DTMP=TJC-; else DTMP=; fi;
         if ($BMP); then MPTMP=_BMP; else MPTMP=; fi;
         echo "filename=${DTMP}Aquila_${AVTMP}${MPTMP}_BLT-ProUI-EX${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
@@ -1107,8 +1149,8 @@ jobs:
         mv .pio/build/STM32F103RE_creality/*.bin temp/build.bin
       env:
         AQUILA_VER: ${{ matrix.chip }}
-        TP: ${{ matrix.temp }}
         IS: ${{ matrix.inshape }}
+        TP: ${{ matrix.temp }}
         TJC: ${{ matrix.tjc }}
         BMP: ${{ matrix.bmp }}
     - name: Get release
@@ -1135,9 +1177,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -1206,15 +1248,15 @@ jobs:
       matrix:
         chip: [427,422]
         abl: [UBL,BLT]
-        temp: [true,false]
         inshape: [true,false]
+        temp: [true,false]
         bmp: [true,false]
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -1238,8 +1280,8 @@ jobs:
       id: build_configs
       run: |
         if [ "$AQUILA_VER" = 427 ]; then AVTMP="427"; DBORD='CREALITY_V427'; else AVTMP="422"; DBORD='CREALITY_V422'; fi;
-        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($IS); then ISTMP=-IS; else ISTMP=; fi;
+        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($BMP); then MPTMP=_BMP; else MPTMP=; fi;
         echo "filename=C2-Aquila_${AVTMP}${MPTMP}_${ABL}${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
         > Marlin/Configuration.h
@@ -1282,8 +1324,8 @@ jobs:
       env:
         AQUILA_VER: ${{ matrix.chip }}
         ABL: ${{ matrix.abl }}
-        TP: ${{ matrix.temp }}
         IS: ${{ matrix.inshape }}
+        TP: ${{ matrix.temp }}
         BMP: ${{ matrix.bmp }}
     - name: Get release
       id: get_release
@@ -1306,14 +1348,14 @@ jobs:
       matrix:
         chip: [427,422]
         abl: [MM,Default]
-        temp: [true,false]
         inshape: [true,false]
+        temp: [true,false]
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -1337,8 +1379,8 @@ jobs:
       id: build_configs
       run: |
         if [ "$AQUILA_VER" = 427 ]; then AVTMP="427"; DBORD='CREALITY_V427'; else AVTMP="422"; DBORD='CREALITY_V422'; fi;
-        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($IS); then ISTMP=-IS; else ISTMP=; fi;
+        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         echo "filename=C2-Aquila_${AVTMP}_${ABL}${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
         > Marlin/Configuration.h
         > Marlin/Configuration_adv.h
@@ -1371,8 +1413,8 @@ jobs:
       env:
         AQUILA_VER: ${{ matrix.chip }}
         ABL: ${{ matrix.abl }}
-        TP: ${{ matrix.temp }}
         IS: ${{ matrix.inshape }}
+        TP: ${{ matrix.temp }}
     - name: Get release
       id: get_release
       uses: bruceadams/get-release@v1.3.2
diff --git a/.github/workflows/compile-configs_Ender.yml b/.github/workflows/compile-configs_Ender.yml
index 2e983f28e1..b4bab1e967 100644
--- a/.github/workflows/compile-configs_Ender.yml
+++ b/.github/workflows/compile-configs_Ender.yml
@@ -19,9 +19,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -96,9 +96,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -175,9 +175,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -266,9 +266,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -349,9 +349,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -436,9 +436,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -517,9 +517,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -600,9 +600,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -696,9 +696,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -787,9 +787,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
@@ -878,9 +878,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4.0.3
       with:
-        node-version: 16
+        node-version: 20
     - name: Cache pip
       uses: actions/cache@v4
       with:
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index abf8a1a301..1b8d1263b9 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -132,11 +132,11 @@
 #endif
 
 #ifndef G26_XY_FEEDRATE
-  #define G26_XY_FEEDRATE (PLANNER_XY_FEEDRATE_MM_S / 3.0)
+  #define G26_XY_FEEDRATE (XY_PROBE_FEEDRATE_MM_S / 3.0)
 #endif
 
 #ifndef G26_XY_FEEDRATE_TRAVEL
-  #define G26_XY_FEEDRATE_TRAVEL (PLANNER_XY_FEEDRATE_MM_S / 1.5)
+  #define G26_XY_FEEDRATE_TRAVEL (XY_PROBE_FEEDRATE_MM_S / 1.5)
 #endif
 
 #if CROSSHAIRS_SIZE >= INTERSECTION_CIRCLE_RADIUS
@@ -783,7 +783,7 @@ void GcodeSuite::G26() {
 
         g26.recover_filament(destination);
 
-        { REMEMBER(fr, feedrate_mm_s, PLANNER_XY_FEEDRATE_MM_S * 0.1f);
+        { REMEMBER(fr, feedrate_mm_s, XY_PROBE_FEEDRATE_MM_S * 0.1f);
           plan_arc(endpoint, arc_offset, false, 0);  // Draw a counter-clockwise arc
           destination = current_position;
         }
diff --git a/Marlin/src/inc/Conditionals-5-post.h b/Marlin/src/inc/Conditionals-5-post.h
index 72abb74de4..8a116f3e65 100644
--- a/Marlin/src/inc/Conditionals-5-post.h
+++ b/Marlin/src/inc/Conditionals-5-post.h
@@ -3156,13 +3156,17 @@
   #if ALL(ENDSTOPPULLUPS, USE_Z_MIN_PROBE)
     #define ENDSTOPPULLUP_ZMIN_PROBE
   #endif
-  #ifndef XY_PROBE_FEEDRATE
-    #define XY_PROBE_FEEDRATE ((homing_feedrate_mm_m.x + homing_feedrate_mm_m.y) / 2)
-  #endif
   #ifndef NOZZLE_TO_PROBE_OFFSET
     #define NOZZLE_TO_PROBE_OFFSET { 0, 0, 0 }
   #endif
 #endif
+#ifndef XY_PROBE_FEEDRATE
+  #if ALL(HAS_X_AXIS, HAS_Y_AXIS)
+    #define XY_PROBE_FEEDRATE ((homing_feedrate_mm_m.x + homing_feedrate_mm_m.y) / 2)
+  #else
+    #define XY_PROBE_FEEDRATE 3600.0f
+  #endif
+#endif
 
 /**
  * XYZ Bed Skew Correction
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 0937817b9b..1d5ac6875a 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -842,7 +842,7 @@ void MarlinUI::init() {
       // Add a manual move to the queue?
       if (axis == NO_AXIS_ENUM || PENDING(millis(), start_time) || planner.is_full()) return;
 
-      const feedRate_t fr_mm_s = (axis < LOGICAL_AXES) ? manual_feedrate_mm_s[axis] : PLANNER_XY_FEEDRATE_MM_S;
+      const feedRate_t fr_mm_s = (axis < LOGICAL_AXES) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S;
 
       /**
        * For a rotational axis apply the "inch" to "mm" conversion factor. This mimics behaviour of the G-code G1
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index b24e3380e4..b0d994ed9a 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -2060,7 +2060,7 @@ float get_move_distance(const xyze_pos_t &diff OPTARG(HAS_ROTATIONAL_AXES, bool
           if (planner.buffer_line(raised, fr_zfast)) {
             //  2. Move to the current native XY and raised Z. Presumably this is a null move.
             xyze_pos_t curpos = current_position; curpos.z = raised_parked_position.z;
-            if (planner.buffer_line(curpos, PLANNER_XY_FEEDRATE_MM_S)) {
+            if (planner.buffer_line(curpos, XY_PROBE_FEEDRATE_MM_S)) {
               //  3. Lower Z back down
               line_to_current_position(fr_zfast);
             }
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index 1444ca35b8..cd19219ac5 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -63,8 +63,6 @@ extern xyz_pos_t cartes;
   #define XY_PROBE_FEEDRATE_MM_S xy_probe_feedrate_mm_s
 #elif defined(XY_PROBE_FEEDRATE)
   #define XY_PROBE_FEEDRATE_MM_S MMM_TO_MMS(XY_PROBE_FEEDRATE)
-#else
-  #define XY_PROBE_FEEDRATE_MM_S PLANNER_XY_FEEDRATE_MM_S
 #endif
 
 #if HAS_BED_PROBE
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index bf762fe565..8bcfb38b1f 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -356,12 +356,12 @@ typedef struct PlannerSettings {
     #undef _DLIM
   #endif
 
- feedRate_t max_feedrate_mm_s[DISTINCT_AXES];   // (mm/s) M203 XYZE - Max speeds
+ feedRate_t max_feedrate_mm_s[DISTINCT_AXES],   // (mm/s) M203 XYZE - Max speeds
+            min_feedrate_mm_s,                  // (mm/s) M205 S - Minimum linear feedrate
+            min_travel_feedrate_mm_s;           // (mm/s) M205 T - Minimum travel feedrate
       float acceleration,                       // (mm/s^2) M204 S - Normal acceleration. DEFAULT ACCELERATION for all printing moves.
             retract_acceleration,               // (mm/s^2) M204 R - Retract acceleration. Filament pull-back and push-forward while standing still in the other axes
             travel_acceleration;                // (mm/s^2) M204 T - Travel acceleration. DEFAULT ACCELERATION for all NON printing moves.
- feedRate_t min_feedrate_mm_s,                  // (mm/s) M205 S - Minimum linear feedrate
-            min_travel_feedrate_mm_s;           // (mm/s) M205 T - Minimum travel feedrate
 } planner_settings_t;
 
 #if ENABLED(IMPROVE_HOMING_RELIABILITY)
@@ -1113,14 +1113,6 @@ class Planner {
     #endif // HAS_JUNCTION_DEVIATION
 };
 
-#if HAS_Y_AXIS
-  #define PLANNER_XY_FEEDRATE_MM_S _MIN(planner.settings.max_feedrate_mm_s[X_AXIS], planner.settings.max_feedrate_mm_s[Y_AXIS])
-#elif HAS_X_AXIS
-  #define PLANNER_XY_FEEDRATE_MM_S planner.settings.max_feedrate_mm_s[X_AXIS]
-#else
-  #define PLANNER_XY_FEEDRATE_MM_S 60.0f
-#endif
-
 #define ANY_AXIS_MOVES(BLOCK)  \
   (false NUM_AXIS_GANG(        \
   || BLOCK->steps.a, || BLOCK->steps.b, || BLOCK->steps.c, \
diff --git a/configurations/Voxelab Aquila/BLT/Configuration_adv.h b/configurations/Voxelab Aquila/BLT/Configuration_adv.h
index ef0ccb83fc..09a47181be 100644
--- a/configurations/Voxelab Aquila/BLT/Configuration_adv.h	
+++ b/configurations/Voxelab Aquila/BLT/Configuration_adv.h	
@@ -2370,7 +2370,7 @@
  * underextrusion at high extruder speeds that are otherwise well-behaved (i.e., not skipping).
  * For better results also enable ADAPTIVE_STEP_SMOOTHING.
  */
-//#define NONLINEAR_EXTRUSION // (560 bytes of flash)
+#define NONLINEAR_EXTRUSION // (560 bytes of flash)
 
 // @section leveling
 
diff --git a/configurations/Voxelab Aquila/Default/Configuration_adv.h b/configurations/Voxelab Aquila/Default/Configuration_adv.h
index a989112adb..9ebef3ed3e 100644
--- a/configurations/Voxelab Aquila/Default/Configuration_adv.h	
+++ b/configurations/Voxelab Aquila/Default/Configuration_adv.h	
@@ -2370,7 +2370,7 @@
  * underextrusion at high extruder speeds that are otherwise well-behaved (i.e., not skipping).
  * For better results also enable ADAPTIVE_STEP_SMOOTHING.
  */
-//#define NONLINEAR_EXTRUSION // (560 bytes of flash)
+#define NONLINEAR_EXTRUSION // (560 bytes of flash)
 
 // @section leveling
 
diff --git a/configurations/Voxelab Aquila/MM/Configuration_adv.h b/configurations/Voxelab Aquila/MM/Configuration_adv.h
index a989112adb..9ebef3ed3e 100644
--- a/configurations/Voxelab Aquila/MM/Configuration_adv.h	
+++ b/configurations/Voxelab Aquila/MM/Configuration_adv.h	
@@ -2370,7 +2370,7 @@
  * underextrusion at high extruder speeds that are otherwise well-behaved (i.e., not skipping).
  * For better results also enable ADAPTIVE_STEP_SMOOTHING.
  */
-//#define NONLINEAR_EXTRUSION // (560 bytes of flash)
+#define NONLINEAR_EXTRUSION // (560 bytes of flash)
 
 // @section leveling
 
diff --git a/configurations/Voxelab Aquila/UBL/Configuration_adv.h b/configurations/Voxelab Aquila/UBL/Configuration_adv.h
index ef0ccb83fc..09a47181be 100644
--- a/configurations/Voxelab Aquila/UBL/Configuration_adv.h	
+++ b/configurations/Voxelab Aquila/UBL/Configuration_adv.h	
@@ -2370,7 +2370,7 @@
  * underextrusion at high extruder speeds that are otherwise well-behaved (i.e., not skipping).
  * For better results also enable ADAPTIVE_STEP_SMOOTHING.
  */
-//#define NONLINEAR_EXTRUSION // (560 bytes of flash)
+#define NONLINEAR_EXTRUSION // (560 bytes of flash)
 
 // @section leveling
 
diff --git a/configurations/Voxelab Aquila/X3/Configuration_adv.h b/configurations/Voxelab Aquila/X3/Configuration_adv.h
index befc2ebc37..baeb23c76f 100644
--- a/configurations/Voxelab Aquila/X3/Configuration_adv.h	
+++ b/configurations/Voxelab Aquila/X3/Configuration_adv.h	
@@ -2370,7 +2370,7 @@
  * underextrusion at high extruder speeds that are otherwise well-behaved (i.e., not skipping).
  * For better results also enable ADAPTIVE_STEP_SMOOTHING.
  */
-//#define NONLINEAR_EXTRUSION // (560 bytes of flash)
+#define NONLINEAR_EXTRUSION // (560 bytes of flash)
 
 // @section leveling
 
diff --git a/ini/features.ini b/ini/features.ini
index e9521e10e3..c6cb43f4c9 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -312,7 +312,7 @@ CONTROLLER_FAN_EDITABLE                = build_src_filter=+<src/gcode/feature/co
 HAS_ZV_SHAPING                         = build_src_filter=+<src/gcode/feature/input_shaping/M593.cpp>
 GCODE_MACROS                           = build_src_filter=+<src/gcode/feature/macro/M810-M819.cpp>
 GRADIENT_MIX                           = build_src_filter=+<src/gcode/feature/mixing/M166.cpp>
-NONLINEAR_EXTRUSION                    = build_src_filter=+<src/gcode/feature/nonlinear>
+NONLINEAR_EXTRUSION                    = build_src_filter=+<src/gcode/feature/nonlinear/M592.cpp>
 HAS_SAVED_POSITIONS                    = build_src_filter=+<src/gcode/feature/pause/G60.cpp> +<src/gcode/feature/pause/G61.cpp>
 PARK_HEAD_ON_PAUSE                     = build_src_filter=+<src/gcode/feature/pause/M125.cpp>
 FILAMENT_LOAD_UNLOAD_GCODES            = build_src_filter=+<src/gcode/feature/pause/M701_M702.cpp>