Merge pull request #1981 from hanipouspilot/ncm