Merge branch 'issue/57' into 'develop'

Issue #57: Fix SQL

See merge request !872
2 jobs for develop in 1 minute and 53 seconds (queued for 2 seconds)