Add feature to the sql.
Merge branch 'feature'