Merge "Additional fixes to KPM"

No match.