[master/f20] Fix the selection of default groups (#1023263)