Merge branch 'features/JAL-2681_duplicatecrossrefs' into documentation/JAL-2675_relea...