Merge Gregg's Changes.

Merge Gregg's Changes