Fix JENKINS-13647