Created by: efritz
Closes https://github.com/sourcegraph/sourcegraph/issues/15938. Closes https://github.com/sourcegraph/sourcegraph/issues/15939.