merge branch-1-win to condor-branch-1