*8412* CrossRef empty elements fix ported to master