Use --no-db when calling execSql.sh
Merge branch 'dev' into test