Merge "6b/ Group visible tasks into a single mixed grouped task" into main