Note changes for JENKINS-18086