improve data update statement
Merge branch 'dev'