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