Created by: eseliger
This can only be merged after 3.41 is released. See https://github.com/sourcegraph/sourcegraph/pull/36059 for the original change.
Validated with our DB test suite.