Merge "Always validate uploads over api"