small config commit
merged nvs-master in master