Fixed JENKINS-22058