Created by: slimsag
Includes (likely) fixes for https://github.com/sourcegraph/sourcegraph/issues/12999