Merge branch '2022-05-11-Kconfig-cleanups-etc'