FS-4768 windows fix long term initial build problem