Merge branch '2020-05-15-kconfig-migrations'