Merge branch 'removing-grouped-reports' into 'develop'