Merge branch '2022-01-21-Kconfig-migrations'