Foundation upgrade
Merge branch 'T62'