Merge "Fix HighlightingFragment"