Support more multipart stuff
Merge branch 'patch-1' into patch-1+progress