Closes #3014 Co-authored-by: TheUltimateCoder <no@e.mail> (cherry picked from commit 092186dab2b7c91219f9d137c614e068252aa166)