Merge branch 'bug/JAL-2541cutWithFeatures' into features/JAL-2446NCList