adikul30: Cherry-pick-release-2.6 windows support fixes from #1996 and #1998

No Results