Add configurable upload and update
Merge branch 'staging'