Fix JENKINS-17188