Merge branch '2020-10-09-kconfig-reorg'