7.0 counting hours

Merged Leandro Martinek requested to merge 7.0-counting_hours into 7.0

Merge request reports