[FIXED JENKINS-19693]