proposed solution for issue JENKINS-19015