Timeout upload after 20 secs
Merge