Merge branch '2021-11-05-Kconfig-syncs'