Merge branch '2022-07-05-more-Kconfig-migrations' into next