Merge branch 'master.nomsvcproj' into 'master'