Merge branch 'master' into 'develop-CRPSS'

# Conflicts:
#   R/RPS.R
#   tests/testthat/test-RPS.R
1 job for develop-CRPSS
in 6 minutes and 58 seconds, using 0 compute credits, and was queued for 3 seconds