[FIXED JENKINS-17769], [FIXED JENKINS-17915],