Fix JENKINS-16281