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