Tooltip fix in header
Merge