3.0 upgrade commit
Upgrade to Architect 3.0 build 1337