Merge branch 'feature/JAL-984splitAdjuster' into releases/Release_2_10_4_Branch