Merge branch 'bug/JAL-1923_290b2_group_annots' into develop