Merge pull request #7069 from illume/upstream-unscheduled-pod-grouping-0059