See #890: integrated various reviews

6 jobs for 890-reports-model in 3 minutes and 26 seconds (queued for 1 minute and 35 seconds)