Fix JENKINS-16316