Fix JENKINS-16874