Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/4173
Helps https://gitlab.com/gitlab-org/gitlab-ce/issues/15423