Rework handling of skipped features in replay
Merge pull request #1990 from elemoine/select-bug

Rework handling of skipped features in replay