Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'