DC | #4054 | Handling skippable groups