FIXED JENKINS-16828