Add support for the use case with grouped headers: 