Implemented JENKINS-23653