Merge branch 'bug/JAL-1853_gapchar_output' into develop