Merge change 21783 into eclair

* changes:
  Windows: Fix platform build.