Merge in changes from hash trunk. Most are in response to the review.

svn path=; revision=42111
Merge in changes.

svn path=; revision=42180