Merge branch 'ui-multipart'

REVIEW: 113259
REVIEW: 113291