Noting JENKINS-18654 in 1.524