Fix JENKINS-16269