Compiled from ec26e53 - Merge branch 'mrorz/highlight' into dev