Implemented JENKINS-24553
Merge
Merge branch 'JENKINS-24553'