Fix MAGN-786
Merge pull request #794 from ke-yu/ChocoButter

Fix MAGN-786: N2C should exclude the watch nodes