[CB-5739] Win8 build