merge kconfig dependency fix into main SMT_NICE patch