Merge branch '2020-05-07-more-kconfig-migrations'