Merge branch 'bertvs-master-patch-09002' into 'master'

Use Case 3 code

See merge request !107
1 job for develop-CalibrationRPC
in 37 minutes and 6 seconds, using 0 compute credits, and was queued for 5 seconds