Merge branch 'improvement/JAL-4308_smalleridtooltip' into develop