Merge "Fix provider leak in PFD" into klp-dev