Merge branch 'bug/JAL-3161annotationTooltipRange' into develop