Rebase flexible-workgroup-scheduling.patch on r1585