Merge JAL-2724 branch 'bug/JAL_2724_annotationcolourongroups' into releases/Release_2...