Merge branch 'dev-loic' into 'develop'

Dev loic

See merge request !208
4 jobs for develop in 55 seconds (queued for 3 seconds)