Merge branch 'bug/JAL-2541cutRelocateFeatures' into develop