JAL-3285 code changes to AnnotationLabels not included in the merge