Merge branch '2022-12-05-Kconfig-migrations-and-renames' into next