dt' changes
Merge branch 'dt'
master merge dt and some fixed