Merge branch 'ah/doc-wserrorhighlight'