chore: Update from Master

[WilcoFiers]

<< Describe the changes >>

Closes issue:

Reviewer checks

Required fields, to be filled out by PR reviewer(s)

• [ ] Follows the commit message policy, appropriate for next version
• [ ] Has documentation updated, a DU ticket, or requires no documentation change
• [ ] Includes new tests, or was unnecessary
• [ ] Code is reviewed for security by: << Name here >>

[stephenmathieson]

This needs to be done in a separate branch, otherwise the release job will run.

Additionally, we need to resolve the conflict.

[stephenmathieson]

86