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