Reference JENKINS-23840 for #1315