Merge "Fixed another issue where the group was wrongly clipped"