Implemented JENKINS-24264