Refuel Rearm Issues

[Exorcet]

I was testing the Land, refuel, rearm waypoint in the latest OB. A couple of issues:

The AI won't refuel if starting with a small amount of fuel. I originally set AWACS to orbit for 8 hours, but only gave it 20% fuel. I wanted the AI to land and refuel before doing the long orbit. This lead to the AI landing, shutting down, taking no fuel, and then despawning.

After changing the AI initial fuel state to 100 and orbit end time to 10 minutes, refuel would happen on the ground. But upon taking off the AI would just fly in circles around WP0 and never actually begin its orbit, which was at WP1.

Track attached.

Also a side note, why does Refuel/arm need us to add a waypoint change command, shouldn't this be inherent in the task?

RefuelRearmbug.trk