Merge branch 'feature/correlation-time' into develop

2 jobs for develop in 7 minutes and 11 seconds (queued for 1 second)