Incorporate latest upload/download code into the client SDK from P&E
Addressing code review feedback.