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