Fix JENKINS-17438