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