Cherry-pick be897b to 16.4 backport

Can't show this merge request because the target branch cherry-pick-734e8efc-to-16-4 is missing from project gitlab-org/gitlab. Close this merge request or update the target branch.