Merge 2.0.0 modification to prepare v1.2.2 release.