update upstream version to 35
rebase fix for windows; build ok
trying to fix start err
fix build on linux