Updated of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9603
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/26598