Merge branch 'bug/JAL-3536getCrossrefTwice' into develop