Implemented JENKINS-24553