Code

Adjust Windows build after fixing LP #520532