options labels highlight now woot
Merge origin/M7 into M7