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