NX-390: fix P2 runtime imports