Fix JENKINS-19072