Added the exclusion of NM if version = 1.2
Merge branch 'staging'