Merge remote-tracking branch 'origin/staging' into OCF47-logs-in-register-service

11 jobs for !35 with OCF47-logs-in-register-service
in 3 minutes and 44 seconds, using 0 compute credits, and was queued for 2 seconds
merge request