Fixed JENKINS-18107