Merge branch 'bug/JAL-3099alignmentVisibleWidth' into merge/JAL-3099