Fix column group handling without base field override and add tests

Closes #3606969

Merge request reports

Loading