Fix JENKINS-18574