Fix JENKINS-18858