This splits the earlier patch to have the Kconfig enablement separate, as requested by Ingo. Thanks! -Kees