Co-Authored-By: Taloth <Taloth@users.noreply.github.com>
(cherry picked from commit 58ddbcd77e17ef95ecfad4b746084ee9326116f3)