No more memory leaks for Windows
Merge