Merge branch 'sonar' into 'develop'

Sonar

See merge request !39
8 jobs for develop in 8 minutes and 5 seconds (queued for 9 seconds)