Merge pull request #11295 from SmithSamuelM/sam_raet_25

Sam raet 25 Refactored the service methods of the Udp Uxd stacks.
Merge remote-tracking branch 'upstream/develop' into sam_raet_26