471f34a079
(cherry picked from commit ac78146091)
Co-authored-by: Mitch Seaman <mjseaman@users.noreply.github.com>