Merged WindowsDistribution support from winbackend branch