Backport 1.8 3691

Backport fixes for Windows 32 bit SIMD.