Revert "Revert "merge in highlight""

This reverts commit bff114bffdfe694110be7826bddb799d2c61818c.