[FIXED JENKINS-17801]