Minor changes
Flight request behaviour changed
Merge origin/MainBranch into MainBranch