Partial commit for subpart support