(cherry picked from commit 47861fc373) Co-authored-by: Dmitri Makarov <dmakarov@alumni.stanford.edu>
47861fc373