[FIXED JENKINS-23410]

Integrated the fix made in winp 1.20.