These changes were cherry-picked from
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52183
Thanks to @garybell for the original contribution