Revert "Revert "Revert "merge in highlight"""

This reverts commit 118fd47bcee7d067e3833e79f5e477cc29a3dd98.