Rebase to d3d3ce71,update comments, rename a member variable name, fix format issue
Attach a file by drag & drop or click to upload