(Merge 3.3) Issue #8271: Fix compilation on Windows