Noting JENKINS-23872, JENKINS-24006, 19d8b80