CLC-2862 - Upgrade to Foundation 5
https://jira.media.berkeley.edu/jira/browse/CLC-2862
Merge pull request #1919 from christianv/CLC-2862

CLC-2862 - Upgrade to Foundation 5