Parted updates as per @davidone

Fixes #12062.
Fixes #12063.