Fixed JENKINS-24822