Created by: michaellzc
Backporting the changes from https://github.com/sourcegraph/sourcegraph/pull/30641