Merge branch 'staging' into OCF39-remove-capif-client

12 jobs for !31 with OCF39-remove-capif-client
in 5 minutes and 2 seconds, using 0 compute credits, and was queued for 1 second
latest merge request