UAV senario update

Merge some changes