Altered SQL statement
Merge branch 'develop'