Merge "Additional fixes to KPM"