Merge from master + merge conflict fixes
Added clickout to tooltips