Fixed JENKINS-22832