Merge "Move upload stash related exceptions to own files"