SDL: Merge commit '599edaaf935aab69a13b5643566adc652a27e268' into main

[Couldn't obtain the patch due to network issues; please check the above link instead.]