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