change IsDatavalid
Merge branch 'zit3241' into dev