finished SQL job
Merge branch 'master' into hongkun