Merge pull request #6924 from smoriarty21/pilot_name