Merge "Changes to PFD based on API review" into klp-dev