Bump version.
Merge pull request #8304 from yalnazov/upstream_master

Bump version.