Ca user file upload

Don't merge until corresponding branches have been merged on API and TC