Merged in code for Windows Swarm client