Fix JENKINS-17270