Upstreamedge

Needed to do this as USB ram is in use, and ethernet is not used yet.