Merge branch 'bug/JAL-207_pairwise-alignment-context-loss' into develop