Merging NR_UAV-core_R2_125_RIL_E129. Merge conflict was due to an ambiguity in...

2\> if the UE has flight path information available:

2\> if the UE has flight path information available:

2\> if the UE has flight path information available:

3\> include *flightPathInfoAvailable*;

3\>if the UE had not previously provided a flight path information since last entering RRC_CONNECTED state; or

3\> if at least one waypoint was not previously provided; or

3\> if at least one upcoming waypoint that was previously provided is being removed; or

3\> if *flightPathUpdateDistanceThr* is configured and for at least one waypoint, the 3D distance between the previously provided location and the new location is more than the distance threshold configured by *flightPathUpdateDistanceThr*; or

3\> if *flightPathUpdateTimeThr* is configured and, for at least one waypoint, the time between the previously provided timestamp and the new timestamp, if available, is more than the time threshold configured by *flightPathUpdateTimeThr*:

4\> include *flightPathInfoAvailable*;

NOTE: If neither *flightPathUpdateDistanceThr* nor *flightPathUpdateTimeThr* is configured, it is up to UE implementation whether to include *flightPathInfoAvailable*when updated flight path information is available.

NOTE: If neither *flightPathUpdateDistanceThr* nor *flightPathUpdateTimeThr* is configured, it is up to UE implementation whether to include *flightPathInfoAvailable*when updated flight path information is available.