Draft: Fixed a disappearing wire problem in Upgrade tool
Add all base system changes from the Assembly branch
Add all base system changes from the Assembly branch
Fix build errors