d3d45680d4
(cherry picked from commit dd0be3012c)
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>