Merge "Refactor skip_because decorator"