tdok sql
Merge branch 'sql_tdok'