Merge branch 'develop-RPSS' into 'master'

RPS and RPSS

See merge request !86
1 job for master
in 8 minutes and 10 seconds, using 0 compute credits, and was queued for 3 seconds