First step in fixing JENKINS-19658
Fixed JENKINS-18107
Fixed JENKINS-19658
Fixed JENKINS-19658