Created by: dadlerj
Will merge post-CI. @KattMingMing can you update your sourcegraph/sourcegraph PR?