MAVLINK Adaptation (but not compiles on "next branch"