Merge branch '2022-08-04-Kconfig-migrations'