[FIXED JENKINS-19907]