NXP-11493 Apply fix since it doesn't rely on FeaturesRunner