Upload updates

Build on the upgrade_to branch, which is still unmerged as well.