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