Backport Win64 support - part 2
Backport Win64 support - part 3
Backport Win64 support - part 3