Hotfix boost win2 dev

Propagate #119 into develop branch