Fix JENKINS-11599