Rebase changes to annotator-store threading branch