Sync canonical with security branch
What does this MR do and why?
As part of https://gitlab.com/gitlab-org/release/tasks/-/issues/4469 to fix https://gitlab.slack.com/archives/C0139MAV672/p1664477770050789
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.