Merge pull request #9401 from alexanderkyte/generalized_flight