Merge 2.0.0 modification to prepare v1.2.2 release.
Merge pull request #303 from BernardXiong/stable-v1.2.x

Merge 2.0.0 modification to prepare v1.2.2 release.