Partial checkin
Merged changes.