preop data done, need validator
Merge remote-tracking branch 'origin/master'