Merge "Fix ns instant"