Merge pull request #23609 from briennekordis/leading_zero_fix