JENKINS-20245 was already in 1.560