Fix JENKINS-16809