20337 uploader

Merge uploader into master to wait on docBuilder