OC-152: OffLine Uploads