fix conflicts from master branch

2 jobs for !358 with opa-integration in 40 seconds (queued for 1 second)
latest merge request