SDL: Merge commit '607ddd0e101d6b0867036e5c48b0f854d553edce' into main

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