Merge branch 'nvs' into release