Inherited helpers for sub-partials; fix
Applied partial-patch