FIX: Use DN and Group to select Pilots
Merge pull request #1494 from graciani/bug_fix_v6r7

FIX: Use DN and Group to select Pilots