Merge branch 'annotations'