Merging the final-test branch updates into the trunk.

Merging the final-test branch updates into the trunk.