Add all base system changes from the Assembly branch
Add all base system changes from the Assembly branch