Merge "Fix fastdeploy failure in Windows"