master
[JAVA-37265] Update URL API (#17029)
Merge pull request #8125 from eugenp/revert-8119-BAEL-3275-2