Proper fix to xref
Merge branch '2.0' into 2.1