add & and ? check for ns ip
Merge remote-tracking branch 'remoteGit/dev' into dev