Make handling of skipped features faster
Merge pull request #1997 from elemoine/skipped-features-performance

Make handling of skipped features faster