first checker is complete???
ok
Merge branch 'chen-liu'
diag checker done