[KARAF-3085] Enhance FeatureFinder