Merge "Fix missing graphTooltip option"