Fix in-flight behaviour, still need to find out what's going on at the runway
Authored by: ehofman 2017-03-07
Parent: [r2502]
Child: [r2504]
