Merge branch 'issue/500' into 'develop'

SCRUM#500: Fix Linter errors

See merge request !25
4 jobs for develop in 6 minutes and 44 seconds (queued for 1 second)