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