[FIXED JENKINS-18003]