UPDATE: resolving JENKINS-24735