Merge branch 'bug/JAL-2829deleteCharsWithGaps' into develop