Merge "Unmarshall PFDs properly when hand-crafting interface stubs" into klp-dev