Pulling from Main for CORS changes

[IbDaGib]

What does this PR do?

Github Issue Number

Resolves: CORS issue

Relates to: CORS issue

Author checklist

If any of these points have yet to be satisfied, make sure that you set the title to the format DRAFT #issue-num Title

• The title is short and descriptive of the PR. Must start with the Github Issue Number (format: #issue-num Title).
• The description follows proper cl description practices and mentions related Github Issues (make sure this is the first thing you mention).
• Branch has merged in the latest version of main
• Linting has occured, as per the project linting config
• All changed functions have proper docstring/wiki updates (front-end team) to describe what they do and how to use them.
• Add yourself as the assignee.
• Add reviewer a reviewer and let them know on discord.
• Ensure that all relevant ticket has been linked to the PR

Reviewer checklist

• Relevant issue is mentioned in description
• Code solves the issue
• Code follows the specification
• Code is the best solution for the issue
• Branch is ahead of main
• Ensures the fix/feature works locally