[MAT-387] Attempt to fix Windows build