Mixed uploads

Includes parts of Version 4.0.0 beta and Updates for Version 3.2.1