Fixed JENKINS-20222