Co-authored-by: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> (cherry picked from commit c1d9187bb66c0524048020613d816918b84b5532)