Merge branch 'develop' into features/JAL-4134_use_annotation_row_for_colours_and_groups