Implementing from https://gitlab.com/gitlab-org/gitlab-ce/issues/3480#note_2722988
cc @skyruler
For https://gitlab.com/gitlab-org/gitlab-ce/issues/3480