CFS autogroping - port from 3.0