Merge change 25873 into eclair

* changes:
  Fix transformation on windows.