Merge branch '2023-09-19-tidy-up-some-kconfig-options' into next

- Re-organize and tidy up some of our Kconfig options