Final commit.

Diff to be submitted for review.