CLC-4304 - Remove dependency on foundation - type

https://jira.ets.berkeley.edu/jira/browse/CLC-4304
Merge pull request #2987 from christianv/CLC-4304

CLC-4304 - Remove dependency on foundation - type