case 2022 - Structural changes to the facets/grouping.
case 2022 - Code style
Merge branch 'case-2022' into develop