Convert #731287 to NCS