Merge branch 'npc-kpu-updates'