dcfc83d6f3
(cherry picked from commit 52f9b96a8c)
Co-authored-by: Mitch Seaman <mjseaman@users.noreply.github.com>