Re #9588 Minimal changes. This is probably be deprecated in the future
Re #9588 Fix merge with master
Re #9588 Added documentation to the rst file.
Merge remote-tracking branch 'origin/feature/9588_CorrectFlightPaths_doc'