Fix proposal for JENKINS-19379