Keep a single VisibilityAnnotationTag per visibility/host.
Merge branch 'annotation_only_one' into develop