Merge branch 'JAL-1397' into JAL-1372_referenceseq