Fix JENKINS-18609