Fixed group for nvos.
Merge branch 'test' into dev