Fixes #5813 - CLI content uploads BZ1102260