[FIXED JENKINS-17147]