Fix JENKINS-17932