Fixes #9415
patch highlighting hint
Merge pull request #9420 from saiwang/patch-highlight-hint

patch highlighting hint
Merge pull request #9418 from BBosman/fix-9415

Fixes #9415
Merge branch '3.0.0-wip' into BBosman