Conditional uploads

cbugg: bug-305