Merge branch 'boileau' into 'develop'

Boileau

See merge request !46
2 jobs for develop in 21 seconds (queued for 2 seconds)