Merge "Move UploadStashFile to its own file"