[FIXED JENKINS-17290]