Cherry Pick URL fixes into Release 1.4

[nginx-aoife]

Proposed changes

Cherry pick MR #2474 into Release-1.4 branch

Please focus on (optional): If you any specific areas where you would like reviewers to focus their attention or provide
specific feedback, add them here.

Closes #ISSUE

Checklist

Before creating a PR, run through this checklist and mark each as complete.

• I have read the CONTRIBUTING doc
• I have added tests that prove my fix is effective or that my feature works
• I have checked that all unit tests pass after adding my changes
• I have updated necessary documentation
• I have rebased my branch onto main
• I will ensure my PR is targeting the main branch and pulling from my branch from my own fork

Release notes

If this PR introduces a change that affects users and needs to be mentioned in the release notes,
please add a brief note that summarizes the change.

[nginx-aoife]

@salonichf5 here is the cherry pick PR into the release-1.4 branch.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.84%. Comparing base (8e653d6) to head (87c7b99).
Report is 1 commits behind head on release-1.4.

Additional details and impacted files

@@             Coverage Diff              @@
##           release-1.4    #2479   +/-   ##
============================================
  Coverage        88.84%   88.84%           
============================================
  Files              100      100           
  Lines             7527     7527           
  Branches            50       50           
============================================
  Hits              6687     6687           
  Misses             784      784           
  Partials            56       56           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[ADubhlaoich]

LGTM!