Implemented JENKINS-23533