Thanks Marc Tamlyn and Tim Graham for the review. Backport of 7442eb1a24 from master.
7442eb1a24
total_error_count