Merging the pull requests before 2.0 release.