Merge "perf: don't leave group_entry on sibling list (use-after-free)"