Update Annotator to 6623b2c2 (typed-packaging branch)

Integrate recent Annotator changes

x