Updated cool for JENKINS-19657