Fixing error in the SQL file
Merge remote-tracking branch 'origin/develop'