Merge branch 'feature/ou_with_vort' into develop

2 jobs for develop in 14 minutes and 30 seconds (queued for 2 minutes and 51 seconds)