master
Note- the issue number should be where it is on my branch (you can check related issues on gitlab.com); I must have misaligned it on my previous cleanup issue.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59831