Merge branch 'MLAB-172' into 'testing'

routes adapted

See merge request !17
1 job for testing in 9 seconds (queued for 3 seconds)