Merge branch '2020-07-01-kconfig-etc-updates' into next