add highlighting template variables (v 1.8.0)

Change-Id: I0808c518c553bedf0b8cca8a1502c346292c7b5a
Merge "add highlighting template variables (v 1.8.0)"