refinining how tooltip content is updated when tooltip is showing
Merge branch 'dev'