Merge branch 'bug/JAL-2728splitFrameDivision' into develop