Created by: lguychard
Counterpart of https://github.com/sourcegraph/sourcegraph/pull/12238 targeting master