Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466
Closes https://github.com/gitlabhq/gitlabhq/issues/8963