Implemented JENKINS-24577