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