Merge branch 'bug/JAL-2541cutRelocateFeatures' into bug/JAL-2684_fixPairwiseAlignofEd...