Merge "Fix unexpected highlight"