Convert #228347 to NCS