Fix JENKINS-16233