Annotation fixes
Merge remote-tracking branch 'origin/feature/readsets' into feature/readsets