FS-5048 --resolve refactored patch applied with author header
FS-5048 trivial build for windows