Merge branch 'fix-linting-errors' into 'develop'

Fix linting errors

See merge request !145
4 jobs for develop in 14 minutes and 35 seconds (queued for 4 seconds)