cherry pick from version-2.0, update readme.md