Fix org-specific annotations
Merge branch 'hh/fix-org-specific'