Convert #356828 to NCS