Fix JENKINS-22195