Eliminated double escaping labels, causing labels with a space to be non-highlighted.
Merge remote-tracking branch 'origin/dev' into dev