Merge "Add stash support for mw.Api.upload"