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