Adds the changes from b1bf6d88 to 9-3-stable
9-3-stable
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/33536