Reproduce JENKINS-10539

Merge after fixed in core