Convert #397157 to NCS