Merge "add default code for flight mode"