Dev eric

Pulling in foundation changes from dev branch.