[FIXED JENKINS-19852]