Xref part, Fix GNP-5842.

Merged Thomas Letellier requested to merge feat/xrefs into master Mar 04, 2019