Merge branch '153-fix-sq-issues' into 'develop'

Fix bug compilation

Closes #153

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