JENKINS-25069, JENKINS-23533