Fix regression in system tooltips.
Merge branch 'tooltipFix' into develop