CAL-638 fix tooltip on more events
CAL-638 merge branch