tooltip changes
Merge origin/master