merged from branch flight_timer. needs testing