Merge branch 'features/JAL-1152annotationSorting' into features/typed_annotations_calcId