Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/916
@yorickpeterse Could you review?
/cc @pcarranza