Additional group header refinement (related to issue 7091)