update clients to be able to work with several ns

Edited by Mike Hoang

Merge request reports