[ADD] Group as asked

Merged Eric Horvat requested to merge 8.0-FIX-group-periods into 8.0-stage

[FIX] calendar.year.week tabbed with space

Merge request reports