Merger rnet-battery into flight-rnh