Merge "Fix Window-GPU build" into release-4-6