BigW Consortium Gitlab
Merge 10-6-stable-frozen into 10-6-stable See merge request gitlab-org/gitlab-ce!17644