Fix JENKINS-17797