Document linking and term highlighting
Merge remote-tracking branch 'origin/metadata-extraction'