Fix JENKINS-6200