fix sql error with empty list
Merge branch 'origin/develop'