Fix unit test and add comment
Merge branch 'master' into liguo
Merge branch 'master' into gtid