Fix JENKINS-17831