Mbst 9893 more granular uploads

Maybe we can use Preconditions.checkArgument here?