Flight mode fix, cherry picked from master