Merge branch 'master' into 'dev-Scorecards_improvements'

# Conflicts:
#   modules/Scorecards/R/tmp/ScorecardsMulti.R
in 22 minutes and 59 seconds, using 0 compute credits, and was queued for 41 minutes and 43 seconds