highlight union when contiguous
Merge branch 'highlightJoin' into dev