Merge branch 'bug/JAL-3412idWidthDiscrepancy' into develop