Merge branch 'patch/JAL-2238_tcoffee_subgroups' into develop