Adding framework based changes to the resumable upload fix