Concurent ns.Update control
Merge remote-tracking branch 'origin/master' into fix-view-html-update