Core: mergeFocusGroups now just requires at least one non-empty group