Merge branch 'Bug-830' into preview
fix tab highlight
Merge branch 'johtaylo-828' into dev