Merge branch '2020-06-26-more-Kconfig-migration' into next