Merge branch 'fix_broken_master_20240424' into 'master'

Broken master fix

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/150680



Merged-by: Peter Leitzen <pleitzen@gitlab.com>
Approved-by: Peter Leitzen <pleitzen@gitlab.com>
Co-authored-by: Vasilii Iakliushin <viakliushin@gitlab.com>