Minor bug fixing
Fix CreateHandler bug
Merge branch 'logic/wenhao'