Fixed JENKINS-23268