Merge "Fix ns term logic"