JENKINS-19858, JENKINS-14521, JENKINS-18794