Get in sync with v12
Get in sync with v12, fix highlighting annotator
Build the plugin