FS-5527 --resolve
FS-5527 fix compiler error windows