36bfb144b7
(cherry picked from commit 6aa3003a54)
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>