Some improvements of for snapshot uploads.
Merge branch 'test' into dev