BigW Consortium Gitlab
picked from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12944/diffs#3a262e1127de2eedf195d81146090d46487cc967_303_301
