Merge branch 'bug/JAL-2225mapMultipleChains' into develop