post-review proto version
merged from trunk
merged from trunk
merged from trunk