Rebase to 3.24

[thespad]

---

• I have read the contributing guideline and understand that I have made the correct modifications

---

Description:

Benefits of this PR and context:

How Has This Been Tested?

Source / References:

[LinuxServer-CI]

I am a bot, the build for PR commit 5ad20e6 failed and as a result no CI test was attempted and no images were pushed.

[LinuxServer-CI]

I am a bot, here are the test results for this PR for commit 5ad20e6 :
https://ci-tests.linuxserver.io/lspipepr/grav/2.0.3-pkg-c116d626-dev-5ad20e6782e0e8e34fe1fb71c536190837a9c0a3-pr-55/index.html
https://ci-tests.linuxserver.io/lspipepr/grav/2.0.3-pkg-c116d626-dev-5ad20e6782e0e8e34fe1fb71c536190837a9c0a3-pr-55/shellcheck-result.xml

Tag	Passed
amd64-2.0.3-pkg-c116d626-dev-5ad20e6782e0e8e34fe1fb71c536190837a9c0a3-pr-55	✅
arm64v8-2.0.3-pkg-c116d626-dev-5ad20e6782e0e8e34fe1fb71c536190837a9c0a3-pr-55	✅

[LinuxServer-CI]

I am a bot, here are the test results for this PR for commit 01443e2 :
https://ci-tests.linuxserver.io/lspipepr/grav/2.0.3-pkg-c116d626-dev-01443e28ccacd7c357ee5bc6daedf930311bb182-pr-55/index.html
https://ci-tests.linuxserver.io/lspipepr/grav/2.0.3-pkg-c116d626-dev-01443e28ccacd7c357ee5bc6daedf930311bb182-pr-55/shellcheck-result.xml

Tag	Passed
amd64-2.0.3-pkg-c116d626-dev-01443e28ccacd7c357ee5bc6daedf930311bb182-pr-55	✅
arm64v8-2.0.3-pkg-c116d626-dev-01443e28ccacd7c357ee5bc6daedf930311bb182-pr-55	✅

[LinuxServer-CI]

I am a bot, here are the test results for this PR for commit 2e03265 :
https://ci-tests.linuxserver.io/lspipepr/grav/2.0.6-pkg-77f4d46a-dev-2e03265bbfb204e70292079b260142c4ebd02acc-pr-55/index.html
https://ci-tests.linuxserver.io/lspipepr/grav/2.0.6-pkg-77f4d46a-dev-2e03265bbfb204e70292079b260142c4ebd02acc-pr-55/shellcheck-result.xml

Tag	Passed
amd64-2.0.6-pkg-77f4d46a-dev-2e03265bbfb204e70292079b260142c4ebd02acc-pr-55	✅
arm64v8-2.0.6-pkg-77f4d46a-dev-2e03265bbfb204e70292079b260142c4ebd02acc-pr-55	✅