Fix JENKINS-17734