Updating to master to resolve merge conflict#2

Open

ismailfaruk wants to merge 1 commit intodavidBar-On:issue-1144-UDP-connect-retry-mechanismsfrom ismailfaruk:issue-1144-UDP-connect-retry-mechanisms

+4,279-1,516

Commits on May 3, 2024

Squashed commit of the following:
ismailfaruk
committed