Merge branch 'jc/diff-ws-error-highlight'