SDL: Merge commit '3ec4c9b3b9a29f17482ad2e130d6b14d79c5cb97' into main

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