Merge remote-tracking branch 'origin/NCover'
Merge branch 'NCover'