Implemented JENKINS-24577
Implemented JENKINS-24553
Merge
Merge branch 'JENKINS-24553'
Merged
Implemented JENKINS-24577