Merge branch 'dev-rps-crps' into 'master'

Including parameter return_mean for scorecard development

See merge request !179
2 jobs for master
in 14 minutes and 26 seconds, using 0 compute credits, and was queued for 3 seconds