MSVC keeps failing, I'll use this to test the patch without spamming everyone.
Created attachment 361379 [details] Patch
Reopening to attach new patch.
Created attachment 361476 [details] Patch