Merge branch 'jc/ws-error-highlight'