[FIXED JENKINS-20866]