Add new high light logic

Merged Wang Yuyang requested to merge ADD-New-HighLightLogic into master

Merge request reports