Fix JENKINS-16239