Merge branch 'bug/JAL-2547tooltipOnGap' into develop