fixed JENKINS-18386, JENKINS-17597, JENKINS-17093, JENKINS-18399