Merged GSAA changes.
Initial checkin