Implemented JENKINS-24577
Merged
Implemented JENKINS-24577