Merge branch 'feature/JAL-984splitAdjuster' into features/JAL-1793VCF