HOT-FIX: HighlightModel

Merged Wang Yuyang requested to merge Duan into master

Merge request reports